diff --git a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
index d8c836b8..fce08966 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/JavadocReportTest.java
@@ -37,6 +37,7 @@
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 import org.apache.maven.plugins.javadoc.ProxyServer.AuthAsyncProxyServlet;
@@ -594,27 +595,6 @@ public void testOptionsUmlautEncoding() throws Exception {
         }
     }
 
-    /**
-     * @throws Exception if any
-     */
-    public void testExceptions() throws Exception {
-        try {
-            Path testPom = unit.resolve("default-configuration/exception-test-plugin-config.xml");
-            JavadocReport mojo = lookupMojo(testPom);
-            mojo.execute();
-
-            fail("Must throw exception.");
-        } catch (Exception e) {
-            assertTrue(true);
-
-            try {
-                deleteDirectory(new File(getBasedir(), "exception"));
-            } catch (IOException ie) {
-                // nop
-            }
-        }
-    }
-
     /**
      * Method to test the taglet artifact configuration
      *
@@ -821,8 +801,6 @@ public void testHeaderFooter() throws Exception {
         } catch (MojoExecutionException e) {
             fail("Doesnt handle correctly newline for header or footer parameter");
         }
-
-        assertTrue(true);
     }
 
     /**
@@ -838,8 +816,6 @@ public void testNewline() throws Exception {
         } catch (MojoExecutionException e) {
             fail("Doesn't handle correctly newline for string parameters. See options and packages files.");
         }
-
-        assertTrue(true);
     }
 
     /**
@@ -1167,8 +1143,7 @@ public void testStylesheetfile() throws Exception {
         try {
             mojo.execute();
             fail();
-        } catch (Exception e) {
-            assertTrue(true);
+        } catch (MojoExecutionException | MojoFailureException e) {
         }
 
         // stylesheet == java
diff --git a/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml b/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml
deleted file mode 100644
index d14f1f53..00000000
--- a/src/test/resources/unit/default-configuration/exception-test-plugin-config.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.plugins.maven-javadoc-plugin.unit</groupId>
-  <artifactId>exception-test</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <inceptionYear>2006</inceptionYear>
-  <name>Maven Javadoc Plugin Exception Test</name>
-  <url>http://maven.apache.org</url>
-  <build>
-    <finalName>exception-test</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <project implementation="org.apache.maven.plugins.javadoc.stubs.ExceptionTestMavenProjectStub"/>
-          <localRepository>${localRepository}</localRepository>
-          <outputDirectory>exception/..  +  /target/test/unit/default-configuration/target/site/apidocs</outputDirectory>
-          <breakiterator>false</breakiterator>
-          <old>false</old>
-          <show>protected</show>
-          <quiet>true</quiet>
-          <verbose>false</verbose>
-          <author>true</author>
-          <encoding>ISO-8859-1</encoding>
-          <docfilessubdirs>false</docfilessubdirs>
-          <linksource>false</linksource>
-          <nocomment>false</nocomment>
-          <nodeprecated>false</nodeprecated>
-          <nodeprecatedlist>false</nodeprecatedlist>
-          <nohelp>false</nohelp>
-          <noindex>false</noindex>
-          <nonavbar>false</nonavbar>
-          <nosince>false</nosince>
-          <notree>false</notree>
-          <serialwarn>false</serialwarn>
-          <splitindex>false</splitindex>
-          <stylesheet>java</stylesheet>
-          <groups/>
-          <tags/>
-          <use>true</use>
-          <version>true</version>
-          <windowtitle>Maven Javadoc Plugin Exception Test 1.0-SNAPSHOT API</windowtitle>
-          <links>
-             <param>http://java.sun.com/j2se/1.4.2/docs/api</param>
-          </links>
-          <debug>true</debug>
-          <failOnError>true</failOnError>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>