diff --git a/src/main/java/at/zierler/gradle/YamlValidatorTask.java b/src/main/java/at/zierler/gradle/YamlValidatorTask.java
index 6a96377..e8828f6 100644
--- a/src/main/java/at/zierler/gradle/YamlValidatorTask.java
+++ b/src/main/java/at/zierler/gradle/YamlValidatorTask.java
@@ -93,7 +93,7 @@ private boolean isYamlFile(Path file) {
 
         String fileName = fileNameAsPath.toString();
 
-        return fileName.endsWith(".yaml") || fileName.endsWith(".yml");
+        return !Files.isDirectory(file) && (fileName.endsWith(".yaml") || fileName.endsWith(".yml"));
     }
 
     private void validateYamlFile(Path file) {
diff --git a/src/test/java/at/zierler/gradle/YamlValidatorPluginIntTest.java b/src/test/java/at/zierler/gradle/YamlValidatorPluginIntTest.java
index 5655e1a..a437f01 100644
--- a/src/test/java/at/zierler/gradle/YamlValidatorPluginIntTest.java
+++ b/src/test/java/at/zierler/gradle/YamlValidatorPluginIntTest.java
@@ -182,6 +182,24 @@ public void shouldNotValidateFileWithNonYamlEnding() throws IOException {
 
         expectBuildSuccessAndNoStartingMessageForNonYamlFile(nonYamlFile);
     }
+    
+    @Test
+    public void shouldNotValidateFolderWithYamlEnding() throws IOException {
+
+        File yamlFolder = createAndGetYamlFolderInDefaultYamlDirectory("org.yaml");
+        writeBuildFileWithNonYamlFileAsSearchPath(new File(DEFAULT_YAML_DIRECTORY_RELATIVE_PATH));
+
+        expectBuildSuccessAndNoStartingMessageForNonYamlFile(yamlFolder);
+    }
+    
+    @Test
+    public void shouldNotValidateFolderWithYmlEnding() throws IOException {
+
+        File yamlFolder = createAndGetYamlFolderInDefaultYamlDirectory("org.yml");
+        writeBuildFileWithNonYamlFileAsSearchPath(new File(DEFAULT_YAML_DIRECTORY_RELATIVE_PATH));
+
+        expectBuildSuccessAndNoStartingMessageForNonYamlFile(yamlFolder);
+    }
 
     @Test
     public void shouldNotValidateFileWithNonYamlEndingButValidateYamlFileInSameDirectory() throws IOException {
@@ -423,6 +441,11 @@ private File createAndGetYamlFileInSubdirectoryOfDefaultYamlDirectory() throws I
         testProjectDir.newFolder(subdirectoryInDefaultYamlDirectoryRelativePath.split("/"));
         return testProjectDir.newFile(subdirectoryInDefaultYamlDirectoryRelativePath + "file.yaml");
     }
+    
+    private File createAndGetYamlFolderInDefaultYamlDirectory(String folderName) throws IOException {
+        String subdirectoryInDefaultYamlDirectoryRelativePath = DEFAULT_YAML_DIRECTORY_RELATIVE_PATH + folderName + "/";
+        return testProjectDir.newFolder(subdirectoryInDefaultYamlDirectoryRelativePath.split("/"));
+    }
 
     private File createAndGetNonYamlFileInDefaultYamlDirectory() throws IOException {