diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java
index 734ce3f2418..bcde826020f 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRule.java
@@ -57,20 +57,9 @@ public final class HBaseClassTestRule implements TestRule {
 
   private static long getTimeoutInSeconds(Class<?> clazz) {
     Category[] categories = clazz.getAnnotationsByType(Category.class);
-    if (categories.length == 0) {
-      throw new IllegalArgumentException(clazz.getName() + " is not annotated with @Category");
-    }
     for (Class<?> c : categories[0].value()) {
-      if (c == SmallTests.class) {
-        // See SmallTests. Supposed to run 15 seconds.
-        // Lots of these timeout on Jenkins... a stall of ten or twenty seconds mess up what looks
-        // fine when run local.
-        return 60;
-      } else if (c == MediumTests.class) {
-        // See MediumTests. Supposed to run 50 seconds.
-        return 180;
-      } else if (c == LargeTests.class) {
-        // Let large tests have a ten minute timeout.
+      if (c == SmallTests.class || c == MediumTests.class || c == LargeTests.class) {
+        // All tests have a 10minute timeout.
         return TimeUnit.MINUTES.toSeconds(10);
       }
     }
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 6c06acfcf22..1bc48bc0e08 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -36,7 +36,7 @@
     <license.bundles.jquery>true</license.bundles.jquery>
   </properties>
   <build>
-    <!-- Makes sure the resources get added before they are processed
+    <!-- Make sure resources get added before they are processed
       by placing this first -->
     <resources>
       <!-- Add the build webabpps to the classpth -->