diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index d709b6e5c6..f5aacb080e 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -46,7 +46,7 @@
   </prerequisites>
 
   <properties>
-    <doxiaVersion>2.0.0-M12</doxiaVersion>
+    <doxiaVersion>2.0.0</doxiaVersion>
   </properties>
 
   <dependencies>
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>4.0.0-M15</version>
+      <version>4.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
index 7025da05ab..d4d721e852 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
@@ -154,7 +154,7 @@ public void executeReport(Locale locale) {
                 locale,
                 getConsoleLogger(),
                 getReportsDirectories(),
-                constructXrefTestLocation(),
+                linkXRef ? constructXrefLocation(xrefTestLocation, true) : null,
                 showSuccess);
         r.render();
     }
@@ -256,44 +256,6 @@ private List<MavenProject> getProjectsWithoutRoot() {
         return result;
     }
 
-    private String constructXrefTestLocation() {
-        String location = null;
-        if (linkXRef) {
-            File xrefTestLocation = getXrefTestLocation();
-
-            String relativePath = PathTool.getRelativePath(
-                    getReportOutputDirectory().getAbsolutePath(), xrefTestLocation.getAbsolutePath());
-            if (relativePath == null || relativePath.isEmpty()) {
-                relativePath = ".";
-            }
-            relativePath = relativePath + "/" + xrefTestLocation.getName();
-            if (xrefTestLocation.exists()) {
-                // XRef was already generated by manual execution of a lifecycle binding
-                location = relativePath;
-            } else {
-                // Not yet generated - check if the report is on its way
-                Reporting reporting = project.getModel().getReporting();
-                List<ReportPlugin> reportPlugins =
-                        reporting != null ? reporting.getPlugins() : Collections.<ReportPlugin>emptyList();
-                for (ReportPlugin plugin : reportPlugins) {
-                    String artifactId = plugin.getArtifactId();
-                    if ("maven-jxr-plugin".equals(artifactId)) {
-                        location = relativePath;
-                    }
-                }
-            }
-
-            if (location == null) {
-                getConsoleLogger().warning("Unable to locate Test Source XRef to link to - DISABLED");
-            }
-        }
-        return location;
-    }
-
-    private File getXrefTestLocation() {
-        return xrefTestLocation != null ? xrefTestLocation : new File(getReportOutputDirectory(), "xref-test");
-    }
-
     /**
      * @param locale The locale
      * @param key The key to search for