diff --git a/parent/pom.xml b/parent/pom.xml
index 2076e2169..9034ed764 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -131,7 +131,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.12</version>
+                    <version>2.14.1</version>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila.maven-license-plugin</groupId>
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
index 5e96b6f9a..42f429cb5 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
@@ -16,6 +16,8 @@
 package org.mapstruct.ap.testutil.compilation.model;
 
 import java.io.File;
+import java.io.IOException;
+
 import javax.tools.Diagnostic.Kind;
 import javax.tools.JavaFileObject;
 
@@ -41,17 +43,25 @@ public class DiagnosticDescriptor {
     }
 
     public static DiagnosticDescriptor forDiagnostic(Diagnostic diagnostic) {
-        String soureFileName = diagnostic.type().getName().replaceAll( "\\.", File.separator ) + ".java";
+        String soureFileName = diagnostic.type().getName().replace( ".", File.separator ) + ".java";
         return new DiagnosticDescriptor( soureFileName, diagnostic.kind(), diagnostic.line(), "" );
     }
 
     public static DiagnosticDescriptor forDiagnostic(String sourceDir, javax.tools.Diagnostic<? extends JavaFileObject> diagnostic) {
-        return new DiagnosticDescriptor(
-            diagnostic.getSource().getName().substring( sourceDir.length() + 1 ),
-            diagnostic.getKind(),
-            diagnostic.getLineNumber(),
-            ""
-        );
+        try
+        {
+            String sourceName = new File(diagnostic.getSource().toUri()).getCanonicalPath();
+            return new DiagnosticDescriptor(
+                (sourceName.length() > sourceDir.length() ? sourceName.substring( sourceDir.length() + 1 ) : sourceName),
+                diagnostic.getKind(),
+                diagnostic.getLineNumber(),
+                ""
+            );
+        }
+        catch ( IOException e )
+        {
+            throw new RuntimeException( e );
+        }
     }
 
     public String getSourceFileName() {