diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java b/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java
index 6304b1d6..905a738b 100644
--- a/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java
+++ b/src/main/java/org/codehaus/plexus/util/DirectoryScanner.java
@@ -729,7 +729,7 @@ public boolean isSymbolicLink( File parent, String name )
     {
         if ( Java7Detector.isJava7() )
         {
-            return NioFiles.isSymbolicLink( parent );
+            return NioFiles.isSymbolicLink( new File( parent, name ) );
         }
         File resolvedParent = new File( parent.getCanonicalPath() );
         File toTest = new File( resolvedParent, name );
diff --git a/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java b/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java
index 58b8b730..5726c2fe 100644
--- a/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java
+++ b/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java
@@ -405,6 +405,44 @@ public void testRegexWithSlashInsideCharacterClass()
         assertInclusionsAndExclusions( ds.getIncludedFiles(), excludedPaths, includedPaths );
     }
 
+    public void testIsSymbolicLink()
+        throws IOException
+    {
+        // TODO: Uncomment when PR #25 merged
+        // if ( !checkTestFilesSymlinks() )
+        // {
+        // return;
+        // }
+
+        final File directory = new File( "src/test/resources/symlinks/src" );
+        DirectoryScanner ds = new DirectoryScanner();
+        assertTrue( ds.isSymbolicLink( directory, "symR" ) );
+        assertTrue( ds.isSymbolicLink( directory, "symDir" ) );
+        assertFalse( ds.isSymbolicLink( directory, "fileR.txt" ) );
+        assertFalse( ds.isSymbolicLink( directory, "aRegularDir" ) );
+    }
+
+    public void testIsParentSymbolicLink()
+        throws IOException
+    {
+        // TODO: Uncomment when PR #25 merged
+        // if ( !checkTestFilesSymlinks() )
+        // {
+        // return;
+        // }
+
+        final File directory = new File( "src/test/resources/symlinks/src" );
+        DirectoryScanner ds = new DirectoryScanner();
+        assertFalse( ds.isParentSymbolicLink( directory, "symR" ) );
+        assertFalse( ds.isParentSymbolicLink( directory, "symDir" ) );
+        assertFalse( ds.isParentSymbolicLink( directory, "fileR.txt" ) );
+        assertFalse( ds.isParentSymbolicLink( directory, "aRegularDir" ) );
+        assertFalse( ds.isParentSymbolicLink( new File( directory, "aRegularDir" ), "aRegulatFile.txt" ) );
+        assertTrue( ds.isParentSymbolicLink( new File( directory, "symDir" ), "targetFile.txt" ) );
+        assertTrue( ds.isParentSymbolicLink( new File( directory, "symLinkToDirOnTheOutside" ),
+                                             "FileInDirOnTheOutside.txt" ) );
+    }
+
     private void printTestHeader()
     {
         StackTraceElement ste = new Throwable().getStackTrace()[1];
@@ -446,8 +484,7 @@ private void assertInclusionsAndExclusions( String[] files, String[] excludedPat
         StringBuilder buffer = new StringBuilder();
         if ( !failedToExclude.isEmpty() )
         {
-            buffer.append( "Should NOT have included:\n" ).append(
-                                                                   StringUtils.join( failedToExclude.iterator(),
+            buffer.append( "Should NOT have included:\n" ).append( StringUtils.join( failedToExclude.iterator(),
                                                                                      "\n\t- " ) );
         }
 
@@ -458,8 +495,8 @@ private void assertInclusionsAndExclusions( String[] files, String[] excludedPat
                 buffer.append( "\n\n" );
             }
 
-            buffer.append( "Should have included:\n" )
-                  .append( StringUtils.join( failedToInclude.iterator(), "\n\t- " ) );
+            buffer.append( "Should have included:\n" ).append( StringUtils.join( failedToInclude.iterator(),
+                                                                                 "\n\t- " ) );
         }
 
         if ( buffer.length() > 0 )