diff --git a/src/main/java/org/junit/internal/Classes.java b/src/main/java/org/junit/internal/Classes.java
index e8404f685504..a98f7963b1f9 100644
--- a/src/main/java/org/junit/internal/Classes.java
+++ b/src/main/java/org/junit/internal/Classes.java
@@ -21,7 +21,6 @@ public Classes() {
      * {@link Classes}.
      *
      * @param className Name of the class.
-     * @throws ClassNotFoundException
      */
     public static Class<?> getClass(String className) throws ClassNotFoundException {
         return getClass(className, Classes.class);
@@ -34,7 +33,6 @@ public static Class<?> getClass(String className) throws ClassNotFoundException
      *
      * @param className Name of the class.
      * @param callingClass Class that is requesting a the class
-     * @throws ClassNotFoundException
      * @since 4.13
      */
     public static Class<?> getClass(String className, Class<?> callingClass) throws ClassNotFoundException {
diff --git a/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
index 9362cc168965..48a09fbcf7e8 100644
--- a/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
+++ b/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java
@@ -106,7 +106,7 @@ public Builder withLookingForStuckThread(boolean enable) {
          * Builds a {@link FailOnTimeout} instance using the values in this builder,
          * wrapping the given statement.
          *
-         * @param statement
+         * @param statement statement to build
          */
         public FailOnTimeout build(Statement statement) {
             if (statement == null) {
diff --git a/src/main/java/org/junit/rules/ErrorCollector.java b/src/main/java/org/junit/rules/ErrorCollector.java
index 9711e50358f7..f846d7766a8f 100644
--- a/src/main/java/org/junit/rules/ErrorCollector.java
+++ b/src/main/java/org/junit/rules/ErrorCollector.java
@@ -1,6 +1,5 @@
 package org.junit.rules;
 
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertThrows;
 
 import java.util.ArrayList;
@@ -10,6 +9,7 @@
 import org.junit.function.ThrowingRunnable;
 import org.junit.internal.AssumptionViolatedException;
 import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
 import org.junit.runners.model.MultipleFailureException;
 
 /**
@@ -74,7 +74,7 @@ public <T> void checkThat(final T value, final Matcher<T> matcher) {
     public <T> void checkThat(final String reason, final T value, final Matcher<T> matcher) {
         checkSucceeds(new Callable<Object>() {
             public Object call() throws Exception {
-                assertThat(reason, value, matcher);
+                MatcherAssert.assertThat(reason, value, matcher);
                 return value;
             }
         });
diff --git a/src/main/java/org/junit/rules/ExpectedException.java b/src/main/java/org/junit/rules/ExpectedException.java
index 431ad495b12f..165508512c28 100644
--- a/src/main/java/org/junit/rules/ExpectedException.java
+++ b/src/main/java/org/junit/rules/ExpectedException.java
@@ -3,11 +3,11 @@
 import static java.lang.String.format;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause;
 import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
 import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.StringDescription;
 import org.junit.AssumptionViolatedException;
 import org.junit.runners.model.Statement;
@@ -268,7 +268,7 @@ public void evaluate() throws Throwable {
 
     private void handleException(Throwable e) throws Throwable {
         if (isAnyExceptionExpected()) {
-            assertThat(e, matcherBuilder.build());
+            MatcherAssert.assertThat(e, matcherBuilder.build());
         } else {
             throw e;
         }
diff --git a/src/main/java/org/junit/runner/FilterFactories.java b/src/main/java/org/junit/runner/FilterFactories.java
index 020d39445d80..04bcd00975a7 100644
--- a/src/main/java/org/junit/runner/FilterFactories.java
+++ b/src/main/java/org/junit/runner/FilterFactories.java
@@ -16,7 +16,6 @@ class FilterFactories {
      *
      * @param request the request that will be filtered
      * @param filterSpec the filter specification
-     * @throws org.junit.runner.FilterFactory.FilterNotCreatedException
      */
     public static Filter createFilterFromFilterSpec(Request request, String filterSpec)
             throws FilterFactory.FilterNotCreatedException {
diff --git a/src/main/java/org/junit/runner/JUnitCore.java b/src/main/java/org/junit/runner/JUnitCore.java
index c1479e004d5d..31977513994f 100644
--- a/src/main/java/org/junit/runner/JUnitCore.java
+++ b/src/main/java/org/junit/runner/JUnitCore.java
@@ -63,7 +63,7 @@ public static Result runClasses(Computer computer, Class<?>... classes) {
     }
 
     /**
-     * @param system
+     * @param system system to run with
      * @param args from main()
      */
     Result runMain(JUnitSystem system, String... args) {
diff --git a/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java b/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java
index 400fed8fcebf..4f0746275165 100644
--- a/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java
+++ b/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java
@@ -64,7 +64,6 @@ public void testSuiteStarted(Description description) throws Exception {
      * <p/>
      * Synchronized decorator for {@link RunListener#testSuiteFinished(Description)}.
      * @param description the description of the test suite that just ran.
-     * @throws Exception
      * @since 4.13
      */
     @Override
diff --git a/src/main/java/org/junit/runners/model/FrameworkMember.java b/src/main/java/org/junit/runners/model/FrameworkMember.java
index 5634b3f0ca98..cfa3ed8492b2 100644
--- a/src/main/java/org/junit/runners/model/FrameworkMember.java
+++ b/src/main/java/org/junit/runners/model/FrameworkMember.java
@@ -30,7 +30,11 @@ T handlePossibleBridgeMethod(List<T> members) {
             }
         }
         // No shadow or bridge method found. The caller should add *this* member.
-        return (T) this;
+        FrameworkMember<? extends T> thisMember = this;
+        @SuppressWarnings("unchecked")
+        T result = (T) thisMember;
+
+        return result;
     }
 
     abstract boolean isBridgeMethod();