Remove usage of junit.framework

54 files changed, 706 insertions, 357 deletions

diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorIteratorTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorIteratorTestCase.java
index bcebcc1e22d..f71b13191f9 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorIteratorTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorIteratorTestCase.java
@@ -2,11 +2,9 @@
 package com.yahoo.documentapi;
 
 import com.yahoo.document.select.parser.ParseException;
-import com.yahoo.documentapi.ProgressToken;
-import com.yahoo.documentapi.VisitorIterator;
-import junit.framework.TestCase;
 import com.yahoo.document.BucketId;
 import com.yahoo.document.BucketIdFactory;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -14,13 +12,19 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.Vector;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests for VisitorIterator and ProgressToken (kept in one test case because their
  * interactions are so tightly coupled)
- * @author <a href="mailto:vekterli@yahoo-inc.com">Tor Brede Vekterli</a>
+ *
+ * @author vekterli
  */
-public class VisitorIteratorTestCase extends TestCase {
+public class VisitorIteratorTestCase {
 
+    @Test
     public void testIterationSingleBucketUpdate() throws ParseException {
         BucketIdFactory idFactory = new BucketIdFactory();
         ProgressToken progress = new ProgressToken();
@@ -72,6 +76,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(iter.getRemainingBucketCount(), 0);
     }
 
+    @Test
     public void testProgressSerializationRange() throws ParseException {
         int distBits = 4;
 
@@ -256,6 +261,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(progress.toString(), finished.toString());
     }
 
+    @Test
     public void testProgressSerializationExplicit() throws ParseException {
         int distBits = 16;
 
@@ -409,8 +415,8 @@ public class VisitorIteratorTestCase extends TestCase {
     /**
      * Test that doing update() on a bucket several times in a row (without re-fetching
      * from getNext first) works
-     * @throws ParseException
      */
+    @Test
     public void testActiveUpdate() throws ParseException {
         BucketIdFactory idFactory = new BucketIdFactory();
         ProgressToken progress = new ProgressToken();
@@ -443,8 +449,8 @@ public class VisitorIteratorTestCase extends TestCase {
     /**
      * Test that ensures doing update(superbucket, 0) simply puts the bucket back in
      * pending
-     * @throws ParseException
      */
+    @Test
     public void testNullAndSuperUpdate() throws ParseException {
         BucketIdFactory idFactory = new BucketIdFactory();
         ProgressToken progress = new ProgressToken();
@@ -491,6 +497,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(progress.getActiveBucketCount(), 1);
     }
 
+    @Test
     public void testDeserializedFinishedProgress() {
         StringBuilder finished = new StringBuilder();
         finished.append("VDS bucket progress file\n"); // legacy; no completion percentage
@@ -518,6 +525,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(token2.isFinished());
     }
 
+    @Test
     public void testBucketProgressFraction() {
         double epsilon = 0.00001;
         // No progress
@@ -553,6 +561,7 @@ public class VisitorIteratorTestCase extends TestCase {
                 new BucketId(0xb0000fff00000000L)), 1.0, epsilon);
     }
 
+    @Test
     public void testProgressEstimation() throws ParseException {
         int distBits = 4;
 
@@ -606,6 +615,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(progress.percentFinished(), 100, epsilon);
     }
 
+    @Test
     public void testBucketKeyWrapperOrdering() {
         ProgressToken.BucketKeyWrapper bk1 = new ProgressToken.BucketKeyWrapper(0x0000000000000001L);
         ProgressToken.BucketKeyWrapper bk2 = new ProgressToken.BucketKeyWrapper(0x7FFFFFFFFFFFFFFFL);
@@ -648,6 +658,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(consistentKeys);
     }
 
+    @Test
     public void testBucketKeyGeneration() {
         // Due to the number of objects needed to be allocated, only test for a
         // small set of distribution bits
@@ -656,6 +667,7 @@ public class VisitorIteratorTestCase extends TestCase {
         }
     }
 
+    @Test
     public void testSingleBucketSplits() throws ParseException {
         int db = 2;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -716,6 +728,7 @@ public class VisitorIteratorTestCase extends TestCase {
      * source with no finished, active or pending buckets
      * @throws ParseException upon docsel parse failure (shouldn't happen)
      */
+    @Test
     public void testRangeDistributionBitIncrease1NoPending() throws ParseException {
         int db = 2;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -739,6 +752,7 @@ public class VisitorIteratorTestCase extends TestCase {
         }
     }
 
+    @Test
     public void testRangeDistributionBitIncrease1AllBucketStates() throws ParseException {
         int db = 3;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -793,6 +807,7 @@ public class VisitorIteratorTestCase extends TestCase {
         // Assume correct from here on
     }
 
+    @Test
     public void testRangeDistributionIncreaseMultipleBits() throws ParseException {
         int db = 16;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -854,6 +869,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(iter.getNext().getSuperbucket(), new BucketId(20, 0x6000));
     }
 
+    @Test
     public void testSingleBucketMerge() throws ParseException {
         int db = 2;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -875,6 +891,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(bp.getSuperbucket(), new BucketId(db, 0));
     }
 
+    @Test
     public void testRangeDistributionBitDecrease1() throws ParseException {
         int db = 16;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -931,6 +948,7 @@ public class VisitorIteratorTestCase extends TestCase {
 
     // Test that splitting and merging from and to the same db count gives
     // back the initial state
+    @Test
     public void testRangeDistributionBitIncreaseDecrease() throws ParseException {
         int db = 16;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -974,6 +992,7 @@ public class VisitorIteratorTestCase extends TestCase {
     // Test that intermittent changes in distribution are handled properly, e.g.
     // changing from 11 -> 9 with X active and then before all those are flushed,
     // the distribution goes up to 12
+    @Test
     public void testRangeDistributionBitChangeWithoutDone() throws ParseException {
         int db = 11;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -1042,6 +1061,7 @@ public class VisitorIteratorTestCase extends TestCase {
     }
 
     // Test a drop from 31->11 bits upon iteration start
+    @Test
     public void testRangeDistributionBitInitialDrop() throws ParseException {
         int db = 31;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -1084,6 +1104,7 @@ public class VisitorIteratorTestCase extends TestCase {
     // Similar to testRangeDistributionBitInitialDrop, but going from 1 to 11
     // This tests that doing so may be done in an optimized way rather than
     // attempting to split enough buckets to cover the entire bucket space!
+    @Test
     public void testRangeDistributionLosslessReset() throws ParseException {
         int db = 1;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -1151,6 +1172,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(bp[0].getSuperbucket(), new BucketId(11, 0));
     }
 
+    @Test
     public void testExplicitDistributionBitIncrease() throws ParseException {
         int distBits = 12;
 
@@ -1176,6 +1198,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(p.getTotalBucketCount(), 3);
     }
 
+    @Test
     public void testExplicitDistributionBitDecrease() throws ParseException {
         int distBits = 20;
 
@@ -1201,6 +1224,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(p.getTotalBucketCount(), 3);
     }
 
+    @Test
     public void testExplicitDistributionImportNoTruncation() throws ParseException {
         BucketIdFactory idFactory = new BucketIdFactory();
         ProgressToken p = new ProgressToken();
@@ -1227,6 +1251,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(3, p2.getTotalBucketCount());
     }
 
+    @Test
     public void testImportProgressWithOutdatedDistribution() throws ParseException {
         String input = "VDS bucket progress file\n" +
                 "10\n" +
@@ -1266,6 +1291,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertEquals(p2.getBucketCursor(), 503 << 2);
     }
 
+    @Test
     public void testImportInconsistentProgressIncrease() throws ParseException {
         // Bucket progress "file" that upon time of changing from 4 to 7
         // distribution bits and writing the progress had an active bucket
@@ -1311,6 +1337,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(iter.hasNext());
     }
 
+    @Test
     public void testImportInconsistentProgressDecrease() throws ParseException {
         // Bucket progress "file" that upon time of changing from 4 to 7
         // distribution bits and writing the progress had an active bucket
@@ -1342,6 +1369,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(iter.hasNext());
     }
 
+    @Test
     public void testEntireBucketSpaceCovered() throws ParseException {
         int db = 4;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -1382,6 +1410,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(buckets.isEmpty());
     }
 
+    @Test
     public void testExceptionOnWrongDocumentSelection() throws ParseException {
         BucketIdFactory idFactory = new BucketIdFactory();
         // Since we don't store the actual original document selection in the
@@ -1423,6 +1452,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(caughtIt);
     }
 
+    @Test
     public void testIsBucketFinished() throws ParseException {
         BucketIdFactory idFactory = new BucketIdFactory();
         ProgressToken p = new ProgressToken();
@@ -1449,6 +1479,7 @@ public class VisitorIteratorTestCase extends TestCase {
 
     // Test that altering distribution bit count sets ProgressToken as
     // inconsistent when there are active buckets
+    @Test
     public void testInconsistentState() throws ParseException {
         int db = 16;
         BucketIdFactory idFactory = new BucketIdFactory();
@@ -1479,6 +1510,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertFalse(p.isInconsistentState());
     }
 
+    @Test
     public void testMalformedProgressFile() {
         boolean caughtIt = false;
         try {
@@ -1495,6 +1527,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(caughtIt);
     }
 
+    @Test
     public void testFailOnTooFewLinesInFile() {
         boolean caughtIt = false;
         try {
@@ -1507,6 +1540,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(caughtIt);
     }
 
+    @Test
     public void testUnknownFirstHeaderLine() {
         boolean caughtIt = false;
         try {
@@ -1523,6 +1557,7 @@ public class VisitorIteratorTestCase extends TestCase {
         assertTrue(caughtIt);
     }
 
+    @Test
     public void testBinaryProgressSerialization() {
         String input = "VDS bucket progress file (48.828125% completed)\n" +
                 "10\n" +
@@ -1537,4 +1572,5 @@ public class VisitorIteratorTestCase extends TestCase {
         ProgressToken p2 = new ProgressToken(buf);
         assertEquals(input, p2.toString());
     }
- }
+
+}
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java
index d9d43ffef53..81dbb483366 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java
@@ -2,12 +2,16 @@
 package com.yahoo.documentapi.messagebus.loadtypes.test;
 
 import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author thomasg
  */
-public class LoadTypesTestCase extends TestCase {
+public class LoadTypesTestCase {
+
+    @Test
     public void testIdGeneration() {
         LoadTypeSet set = new LoadTypeSet();
         set.addType("vespagrim", "VERY_HIGH");
@@ -21,4 +25,5 @@ public class LoadTypesTestCase extends TestCase {
 
         assertEquals(0xc21803d4, set.getNameMap().get("vespagrim").getId());
     }
+
 }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java
index 8ad350924d2..a32d6022fef 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyFactoryTestCase.java
@@ -16,25 +16,24 @@ import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.routing.RoutingContext;
 import com.yahoo.messagebus.test.Receptor;
-import com.yahoo.text.Utf8Array;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class PolicyFactoryTestCase extends TestCase {
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Setup
-    //
-    ////////////////////////////////////////////////////////////////////////////////
+public class PolicyFactoryTestCase {
 
     private Slobrok slobrok;
     private TestServer srv;
     private SourceSession src;
 
-    @Override
+    @Before
     public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         srv = new TestServer(new MessageBusParams().addProtocol(new DocumentProtocol(new DocumentTypeManager())),
@@ -42,19 +41,14 @@ public class PolicyFactoryTestCase extends TestCase {
         src = srv.mb.createSourceSession(new SourceSessionParams().setReplyHandler(new Receptor()));
     }
 
-    @Override
+    @After
     public void tearDown() {
         slobrok.stop();
         src.destroy();
         srv.destroy();
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Tests
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
+    @Test
     public void testFactory() {
         Route route = Route.parse("[MyPolicy]");
         assertTrue(src.send(createMessage(), route).isAccepted());
@@ -76,12 +70,6 @@ public class PolicyFactoryTestCase extends TestCase {
         assertEquals(DocumentProtocol.ERROR_POLICY_FAILURE, reply.getError(0).getCode());
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
     private static Message createMessage() {
         Message msg = new RemoveDocumentMessage(new DocumentId("doc:scheme:"));
         msg.getTrace().setLevel(9);
@@ -121,4 +109,5 @@ public class PolicyFactoryTestCase extends TestCase {
             return null;
         }
     }
+
 }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
index 5b3d85bfd76..d77f5f4e39e 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestFrame.java
@@ -21,14 +21,19 @@ import com.yahoo.messagebus.test.SimpleReply;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * This is a utility class to allow easier policy test cases. The most important reason to use this is to make sure that
  * each test uses a "clean" mbus and slobrok instance.
  *
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 @SuppressWarnings("deprecation")
-public class PolicyTestFrame extends junit.framework.Assert {
+public class PolicyTestFrame {
 
     private final AtomicBoolean destroyed = new AtomicBoolean(false);
     private String identity;
@@ -383,4 +388,5 @@ public class PolicyTestFrame extends junit.framework.Assert {
             return ret;
         }
     }
+
 }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java
index 54334c28e70..a01787004c9 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/RoutableFactoryTestCase.java
@@ -11,24 +11,33 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentReply;
 import com.yahoo.documentapi.messagebus.protocol.RoutableFactories50;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.ErrorCode;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.network.Identity;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.test.Receptor;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class RoutableFactoryTestCase extends TestCase {
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Setup
-    //
-    ////////////////////////////////////////////////////////////////////////////////
+public class RoutableFactoryTestCase {
 
     private Slobrok slobrok;
     private DocumentProtocol srcProtocol, dstProtocol;
@@ -36,7 +45,7 @@ public class RoutableFactoryTestCase extends TestCase {
     private SourceSession srcSession;
     private DestinationSession dstSession;
 
-    @Override
+    @Before
     public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         DocumentTypeManager docMan = new DocumentTypeManager();
@@ -51,7 +60,7 @@ public class RoutableFactoryTestCase extends TestCase {
         assertTrue(srcServer.waitSlobrok("dst/session", 1));
     }
 
-    @Override
+    @After
     public void tearDown() {
         slobrok.stop();
         dstSession.destroy();
@@ -60,12 +69,7 @@ public class RoutableFactoryTestCase extends TestCase {
         srcServer.destroy();
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Tests
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
+    @Test
     public void testFactory() {
         Route route = Route.parse("dst/session");
 
@@ -126,12 +130,6 @@ public class RoutableFactoryTestCase extends TestCase {
         assertFalse(reply.hasErrors());
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
     private static class MyMessageFactory extends RoutableFactories50.DocumentMessageFactory {
 
         @Override
@@ -185,4 +183,5 @@ public class RoutableFactoryTestCase extends TestCase {
             super(TYPE);
         }
     }
+
 }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/BasicTests.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/BasicTests.java
index 25bed1071a6..14d8818bfec 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/BasicTests.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/BasicTests.java
@@ -5,12 +5,18 @@ import com.yahoo.collections.Pair;
 import com.yahoo.documentapi.messagebus.protocol.WrongDistributionReply;
 import com.yahoo.messagebus.Reply;
 import com.yahoo.messagebus.routing.RoutingNode;
+import org.junit.Test;
 
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
 public class BasicTests extends StoragePolicyTestEnvironment {
 
     /** Test that we can send a message through the policy. */
+    @Test
     public void testNormalUsage() {
         setClusterNodes(new int[]{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 });
             // First we want a wrong distribution reply, so make sure we don't try correct node on random
@@ -22,6 +28,7 @@ public class BasicTests extends StoragePolicyTestEnvironment {
     }
 
     /** Test that we can identify newest cluster state and hang on to correct one. */
+    @Test
     public void testRepliesWrongOrderDuringStateChange() throws Exception{
         {
             setClusterNodes(new int[]{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 });
@@ -47,6 +54,7 @@ public class BasicTests extends StoragePolicyTestEnvironment {
      * bucket 1, which we will be using in the tests. To avoid doing this ahead of every test, we still hardcode the
      * values, though only one place, and have this test to verify they are correct, and make it easy to update the values.
      */
+    @Test
     public void testVerifyBucketOneNodePreferenceInTenNodeDefaultCluster() {
         int result[] = new int[10];
         setClusterNodes(new int[]{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 });
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java
index 8d8fa917af4..10183471ffd 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/Simulator.java
@@ -14,6 +14,9 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public abstract class Simulator extends StoragePolicyTestEnvironment {
 
     enum FailureType {
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java
index a1fc630588e..b2a137abc7d 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java
@@ -5,7 +5,14 @@ import com.yahoo.collections.Pair;
 import com.yahoo.document.DocumentId;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.DocumentTypeManagerConfigurer;
-import com.yahoo.documentapi.messagebus.protocol.*;
+import com.yahoo.documentapi.messagebus.protocol.AsyncInitializationPolicy;
+import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
+import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolRoutingPolicy;
+import com.yahoo.documentapi.messagebus.protocol.ExternalSlobrokPolicy;
+import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage;
+import com.yahoo.documentapi.messagebus.protocol.RoutingPolicyFactory;
+import com.yahoo.documentapi.messagebus.protocol.StoragePolicy;
+import com.yahoo.documentapi.messagebus.protocol.WrongDistributionReply;
 import com.yahoo.documentapi.messagebus.protocol.test.PolicyTestFrame;
 import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Message;
@@ -16,18 +23,29 @@ import com.yahoo.messagebus.routing.RoutingNode;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.vdslib.distribution.Distribution;
 import com.yahoo.vdslib.distribution.RandomGen;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public abstract class StoragePolicyTestEnvironment {
 
-public abstract class StoragePolicyTestEnvironment extends TestCase {
     protected StoragePolicyTestFactory policyFactory;
     protected PolicyTestFrame frame;
     private Set<Integer> nodes;
     protected static int[] bucketOneNodePreference = new int[]{ 3, 5, 7, 6, 8, 0, 9, 2, 1, 4 };
     protected boolean debug = true;
 
-    @Override
+    @Before
     public void setUp() throws Exception {
         DocumentTypeManager manager = new DocumentTypeManager();
         DocumentTypeManagerConfigurer.configure(manager, "file:./test/cfg/testdoc.cfg");
@@ -40,7 +58,7 @@ public abstract class StoragePolicyTestEnvironment extends TestCase {
         frame.setHop(new HopSpec("test", "[storage:cluster=foo]"));
     }
 
-    @Override
+    @After
     public void tearDown() {
         frame.destroy();
     }
@@ -66,6 +84,7 @@ public abstract class StoragePolicyTestEnvironment extends TestCase {
         cluster = cluster.substring(cluster.indexOf('.') + 1);
         return new Pair<>(cluster, distributor);
     }
+
     protected static Pair<String, Integer> getAddress(RoutingNode node) {
         Pair<String, String> pair = extractClusterAndIndexFromPattern(node.getRoute().getHop(0).toString());
         return new Pair<>(pair.getFirst(), Integer.valueOf(pair.getSecond()));
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ScheduledEventQueueTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ScheduledEventQueueTestCase.java
index 312716fc2c4..93146721136 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ScheduledEventQueueTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ScheduledEventQueueTestCase.java
@@ -3,12 +3,16 @@ package com.yahoo.documentapi.messagebus.test;
 
 import com.yahoo.documentapi.messagebus.ScheduledEventQueue;
 import com.yahoo.concurrent.Timer;
-import junit.framework.TestCase;
 import org.junit.Test;
 
 import java.util.concurrent.RejectedExecutionException;
 
-public class ScheduledEventQueueTestCase extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class ScheduledEventQueueTestCase {
 
     class TestTask implements Runnable {
         public long timestamp = 0;
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ThroughputLimitQueueTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ThroughputLimitQueueTestCase.java
index 5bd3de79ce4..75e98bc895a 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ThroughputLimitQueueTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/ThroughputLimitQueueTestCase.java
@@ -3,12 +3,15 @@ package com.yahoo.documentapi.messagebus.test;
 
 import com.yahoo.documentapi.ThroughputLimitQueue;
 import com.yahoo.concurrent.Timer;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author thomasg
  */
-public class ThroughputLimitQueueTestCase extends TestCase {
+public class ThroughputLimitQueueTestCase {
+
      class TestTimer implements Timer {
         public long milliTime = 0;
 
@@ -17,15 +20,7 @@ public class ThroughputLimitQueueTestCase extends TestCase {
         }
     }
 
-
-    public void setUp() {
-
-    }
-
-    public void tearDown() {
-
-    }
-
+    @Test
     public void testCapacity() {
         TestTimer t = new TestTimer();
         t.milliTime = 10;
@@ -50,4 +45,5 @@ public class ThroughputLimitQueueTestCase extends TestCase {
 
         assertEquals(20, q.capacity());
     }
+
 }
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
index c245bb25af9..c8e7f5620de 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSADataTestCase.java
@@ -2,6 +2,8 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -9,10 +11,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.nio.BufferUnderflowException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author geirst
  */
-public class FSADataTestCase extends junit.framework.TestCase {
+public class FSADataTestCase {
 
     private static class Worker extends Thread {
         FSA.State state;
@@ -48,14 +53,12 @@ public class FSADataTestCase extends junit.framework.TestCase {
 
     private FSA fsa;
 
-    public FSADataTestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() throws IOException {
+    @Before
+    public void setUp() throws IOException {
         fsa = new FSA(new FileInputStream("src/test/fsa/test-data.fsa"));
     }
 
+    @Test
     public void testBasic() {
         FSA.State state = fsa.getState();
         state.delta("aa");
@@ -78,6 +81,7 @@ public class FSADataTestCase extends junit.framework.TestCase {
         assertEquals("dddddd data", state.dataString());
     }
 
+    @Test
     public void testMultipleThreads() {
         long numRuns = 10000;
         List<Worker> workers = new ArrayList<Worker>();
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
index 97522a6634d..06150d606d0 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSAIteratorTestCase.java
@@ -2,15 +2,21 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author geirst
  */
-public class FSAIteratorTestCase extends junit.framework.TestCase {
+public class FSAIteratorTestCase {
 
     private FSA fsa;
 
@@ -18,11 +24,8 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
 
     private List<String> expected;
 
-    public FSAIteratorTestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() {
+    @Before
+    public void setUp() {
         fsa = new FSA("src/test/fsa/test-iterator.fsa");
         state = fsa.getState();
 
@@ -59,30 +62,36 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
         assertTrue(beginIdx == endIdx);
     }
 
+    @Test
     public void testIterator() {
         checkIterator(0, expected.size(), "");
     }
 
+    @Test
     public void testIteratorSingle() {
         state.delta("dach");
         checkIterator(6, 7, "dach");
     }
 
+    @Test
     public void testIteratorSubset() {
         state.delta("abd");
         checkIterator(3, 6, "abd");
     }
 
+    @Test
     public void testIteratorFinalState() {
         state.delta("dacia");
         checkIterator(7, 10, "dacia");
     }
 
+    @Test
     public void testIteratorFinalStateOnly() {
         state.delta("dachs");
         checkIterator(6, 7, "dachs");
     }
 
+    @Test
     public void testIteratorEmpty1() {
         state.delta("b");
         java.util.Iterator i = fsa.iterator(state);
@@ -95,6 +104,7 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testIteratorEmpty2() {
         state.delta("daciac");
         java.util.Iterator i = fsa.iterator(state);
@@ -107,6 +117,7 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testIteratorRemove() {
         java.util.Iterator i = fsa.iterator(state);
         try {
@@ -116,4 +127,5 @@ public class FSAIteratorTestCase extends junit.framework.TestCase {
             assertTrue(true);
         }
     }
+
 }
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
index 95b2b22b853..f08f58911ef 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/FSATestCase.java
@@ -2,52 +2,59 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author bratseth
  */
-public class FSATestCase extends junit.framework.TestCase {
+public class FSATestCase {
 
     private FSA fsa;
 
     private FSA.State state;
 
-    public FSATestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() throws IOException {
+    @Before
+    public void setUp() throws IOException {
         fsa=new FSA(new FileInputStream("src/test/fsa/test-fsa.fsa"));
         state=fsa.getState();
     }
 
+    @Test
     public void testSingleWordDelta() {
         state.delta("aword");
         assertTrue(state.isValid());
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testSingleWordDeltaWord() {
         state.deltaWord("aword");
         assertTrue(state.isValid());
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testSingleWordDeltaPartialMatch() {
         state.delta("awo");
         assertTrue(state.isValid());
         assertFalse(state.isFinal());
     }
 
+    @Test
     public void testSingleWordDeltaPartialMatchWord() {
         state.deltaWord("awo");
         assertTrue(state.isValid());
         assertFalse(state.isFinal());
     }
 
+    @Test
     public void testMultiWordDelta() {
         state.delta("th");
         assertFalse(state.isFinal());
@@ -62,6 +69,7 @@ public class FSATestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testMultiWordDeltaWord() {
         state.deltaWord("this");
         assertFalse(state.isFinal());
@@ -74,6 +82,7 @@ public class FSATestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testMultiWordDeltaWordInvalid() {
         state.deltaWord("th");
         assertFalse(state.isFinal());
@@ -82,6 +91,7 @@ public class FSATestCase extends junit.framework.TestCase {
         assertFalse(state.isValid());
     }
 
+    @Test
     public void testMultiWordDeltaTry() {
         assertFalse(state.tryDeltaWord("thiss"));
         assertTrue(state.isValid());
@@ -94,7 +104,6 @@ public class FSATestCase extends junit.framework.TestCase {
         assertTrue(state.tryDeltaWord("test"));
         assertTrue(state.isValid());
         assertTrue(state.isFinal());
-
     }
 
 }
diff --git a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
index 68ee5483b36..fb3e8a3215d 100644
--- a/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
+++ b/fsa/src/test/java/com/yahoo/fsa/test/UTF8TestCase.java
@@ -2,13 +2,20 @@
 package com.yahoo.fsa.test;
 
 import com.yahoo.fsa.FSA;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Iterator;
 import java.nio.charset.Charset;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author geirst
  */
-public class UTF8TestCase extends junit.framework.TestCase {
+public class UTF8TestCase {
 
     private Charset charset = Charset.forName("utf-8");
     private FSA fsa;
@@ -27,11 +34,8 @@ public class UTF8TestCase extends junit.framework.TestCase {
         return retval;
     }
 
-    public UTF8TestCase(String name) {
-        super(name);
-    }
-
-    protected void setUp() {
+    @Before
+    public void setUp() {
         fsa = new FSA("src/test/fsa/utf8.fsa"); // fsa with one word (6 code points, 18 bytes)
         state = fsa.getState();
         int pbuf[] = {0xe0,0xa4,0xb9};
@@ -43,11 +47,13 @@ public class UTF8TestCase extends junit.framework.TestCase {
         word = prefix + suffix;
     }
 
+    @Test
     public void testStringDelta() {
         state.delta(word);
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testCharDelta() {
         assertEquals(6, word.length());
         for (int i = 0; i < word.length(); ++i) {
@@ -57,6 +63,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testByteDelta() {
         FSA.State state = fsa.getState();
         assertEquals(3, prefixBuf.length);
@@ -72,6 +79,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertTrue(state.isFinal());
     }
 
+    @Test
     public void testIteratorAtStart() {
         Iterator<FSA.Iterator.Item> itr = fsa.iterator(state);
         FSA.Iterator.Item item = itr.next();
@@ -79,6 +87,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertFalse(itr.hasNext());
     }
 
+    @Test
     public void testIteratorWithPrefix() {
         state.delta(prefix);
         Iterator<FSA.Iterator.Item> itr = fsa.iterator(state);
@@ -87,6 +96,7 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertFalse(itr.hasNext());
     }
 
+    @Test
     public void testIteratorWithCompleteWord() {
         state.delta(word);
         Iterator<FSA.Iterator.Item> itr = fsa.iterator(state);
@@ -94,4 +104,5 @@ public class UTF8TestCase extends junit.framework.TestCase {
         assertEquals("", item.getString());
         assertFalse(itr.hasNext());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/AbortTest.java b/jrt/tests/com/yahoo/jrt/AbortTest.java
index 785bc0ed561..e3a1685c9e2 100644
--- a/jrt/tests/com/yahoo/jrt/AbortTest.java
+++ b/jrt/tests/com/yahoo/jrt/AbortTest.java
@@ -1,8 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
+import org.junit.After;
+import org.junit.Before;
 
-public class AbortTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class AbortTest {
 
     Supervisor   server;
     Acceptor     acceptor;
@@ -10,10 +15,7 @@ public class AbortTest extends junit.framework.TestCase {
     Target       target;
     Test.Barrier barrier;
 
-    public AbortTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -23,6 +25,7 @@ public class AbortTest extends junit.framework.TestCase {
         barrier = new Test.Barrier();
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -36,6 +39,7 @@ public class AbortTest extends junit.framework.TestCase {
         req.returnValues().add(new Int32Value(value));
     }
 
+    @org.junit.Test
     public void testAbort() {
         Test.Waiter w = new Test.Waiter();
         Request req = new Request("test");
@@ -65,6 +69,7 @@ public class AbortTest extends junit.framework.TestCase {
         assertEquals(0, req.returnValues().size());
     }
 
+    @org.junit.Test
     public void testBogusAbort() {
         Request req = new Request("test");
         req.parameters().add(new Int32Value(40));
@@ -73,4 +78,5 @@ public class AbortTest extends junit.framework.TestCase {
             assertTrue(false);
         } catch (IllegalStateException e) {}
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/BackTargetTest.java b/jrt/tests/com/yahoo/jrt/BackTargetTest.java
index a130bcc5630..3524d47dc1f 100644
--- a/jrt/tests/com/yahoo/jrt/BackTargetTest.java
+++ b/jrt/tests/com/yahoo/jrt/BackTargetTest.java
@@ -1,8 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
+import org.junit.After;
+import org.junit.Before;
 
-public class BackTargetTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class BackTargetTest {
 
     Supervisor server;
     Acceptor   acceptor;
@@ -13,10 +18,7 @@ public class BackTargetTest extends junit.framework.TestCase {
     Target     serverBackTarget;
     Target     clientBackTarget;
 
-    public BackTargetTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -39,6 +41,7 @@ public class BackTargetTest extends junit.framework.TestCase {
         clientBackTarget = null;
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -77,6 +80,7 @@ public class BackTargetTest extends junit.framework.TestCase {
         assertTrue(client == (clientBackTarget != null));
     }
 
+    @org.junit.Test
     public void testBackTarget() {
         checkTargets(false, false);
         target.invokeSync(new Request("sample_target"), 5.0);
@@ -100,6 +104,7 @@ public class BackTargetTest extends junit.framework.TestCase {
         checkValues(3, 3);
     }
 
+    @org.junit.Test
     public void testBogusBackTarget() {
         Request req = new Request("inc");
         try {
@@ -107,4 +112,5 @@ public class BackTargetTest extends junit.framework.TestCase {
             assertTrue(false);
         } catch (IllegalStateException e) {}
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/BufferTest.java b/jrt/tests/com/yahoo/jrt/BufferTest.java
index 08f86df6c7f..f837b036957 100644
--- a/jrt/tests/com/yahoo/jrt/BufferTest.java
+++ b/jrt/tests/com/yahoo/jrt/BufferTest.java
@@ -1,18 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
-
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-public class BufferTest extends junit.framework.TestCase {
-
-    public BufferTest(String name) {
-        super(name);
-    }
-
+public class BufferTest {
 
+    @org.junit.Test
     public void testBuffer() {
 
         int        size = Buffer.MAX_IO + (Buffer.MAX_IO / 10);
@@ -65,6 +63,7 @@ public class BufferTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(x, y));
     }
 
+    @org.junit.Test
     public void testBufferCompact() {
         Buffer buf = new Buffer(10);
         buf.getWritable(3).put((byte)10).put((byte)20).put((byte)30);
@@ -103,8 +102,8 @@ public class BufferTest extends junit.framework.TestCase {
         }
     }
 
+    @org.junit.Test
     public void testBufferMax() {
-
         int        size = Buffer.MAX_IO + (Buffer.MAX_IO / 10);
         Buffer     buf  = new Buffer(1024);
         ByteBuffer b    = null;
@@ -159,6 +158,7 @@ public class BufferTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(x, y));
     }
 
+    @org.junit.Test
     public void testBufferShrink() {
         Buffer     buf = new Buffer(500);
         ByteBuffer b   = null;
@@ -262,4 +262,5 @@ public class BufferTest extends junit.framework.TestCase {
             assertEquals(50, b.get());
         }
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/ConnectTest.java b/jrt/tests/com/yahoo/jrt/ConnectTest.java
index ba22fdf67cc..64ed3f5f954 100644
--- a/jrt/tests/com/yahoo/jrt/ConnectTest.java
+++ b/jrt/tests/com/yahoo/jrt/ConnectTest.java
@@ -1,13 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
+import static org.junit.Assert.assertTrue;
 
-public class ConnectTest extends junit.framework.TestCase {
-
-    public ConnectTest(String name) {
-        super(name);
-    }
+public class ConnectTest {
 
+    @org.junit.Test
     public void testConnect() throws ListenFailedException {
         Test.Orb server   = new Test.Orb(new Transport());
         Test.Orb client   = new Test.Orb(new Transport());
@@ -44,4 +42,5 @@ public class ConnectTest extends junit.framework.TestCase {
         client.transport().shutdown().join();
         server.transport().shutdown().join();
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/DetachTest.java b/jrt/tests/com/yahoo/jrt/DetachTest.java
index 2d4f7084f48..1c1256f0689 100644
--- a/jrt/tests/com/yahoo/jrt/DetachTest.java
+++ b/jrt/tests/com/yahoo/jrt/DetachTest.java
@@ -1,8 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
+import org.junit.After;
+import org.junit.Before;
 
-public class DetachTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class DetachTest {
 
     Test.Orb      server;
     Acceptor      acceptor;
@@ -11,10 +16,7 @@ public class DetachTest extends junit.framework.TestCase {
     Test.Receptor receptor;
     Test.Barrier  barrier;
 
-    public DetachTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Test.Orb(new Transport());
         client   = new Test.Orb(new Transport());
@@ -31,6 +33,7 @@ public class DetachTest extends junit.framework.TestCase {
         barrier = new Test.Barrier();
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -61,6 +64,7 @@ public class DetachTest extends junit.framework.TestCase {
         barrier.waitFor();
     }
 
+    @org.junit.Test
     public void testDetach() {
         Test.Waiter w1 = new Test.Waiter();
         Request req1 = new Request("d_inc");
@@ -103,6 +107,7 @@ public class DetachTest extends junit.framework.TestCase {
         assertTrue(client.readBytes == server.writeBytes);
     }
 
+    @org.junit.Test
     public void testBogusDetach() {
         Request req1 = new Request("inc_b");
         req1.parameters().add(new Int32Value(200));
@@ -133,4 +138,5 @@ public class DetachTest extends junit.framework.TestCase {
         assertEquals(1, req3.returnValues().size());
         assertEquals(101, req3.returnValues().get(0).asInt32());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/EchoTest.java b/jrt/tests/com/yahoo/jrt/EchoTest.java
index 3dab2443b53..240feda8423 100644
--- a/jrt/tests/com/yahoo/jrt/EchoTest.java
+++ b/jrt/tests/com/yahoo/jrt/EchoTest.java
@@ -2,7 +2,12 @@
 package com.yahoo.jrt;
 
 
-public class EchoTest extends junit.framework.TestCase {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertTrue;
+
+public class EchoTest {
 
     Supervisor server;
     Acceptor   acceptor;
@@ -10,10 +15,7 @@ public class EchoTest extends junit.framework.TestCase {
     Target     target;
     Values     refValues;
 
-    public EchoTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -51,6 +53,7 @@ public class EchoTest extends junit.framework.TestCase {
         refValues.add(new StringArray(stringArray));
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -71,6 +74,7 @@ public class EchoTest extends junit.framework.TestCase {
         }
     }
 
+    @org.junit.Test
     public void testEcho() {
         Request req = new Request("echo");
         Values p = req.parameters();
@@ -83,4 +87,5 @@ public class EchoTest extends junit.framework.TestCase {
         assertTrue(Test.equals(req.returnValues(), refValues));
         assertTrue(Test.equals(req.parameters(), refValues));
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/InvokeAsyncTest.java b/jrt/tests/com/yahoo/jrt/InvokeAsyncTest.java
index 87651dadfa1..d744fcf8f29 100644
--- a/jrt/tests/com/yahoo/jrt/InvokeAsyncTest.java
+++ b/jrt/tests/com/yahoo/jrt/InvokeAsyncTest.java
@@ -2,7 +2,14 @@
 package com.yahoo.jrt;
 
 
-public class InvokeAsyncTest extends junit.framework.TestCase {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class InvokeAsyncTest {
 
     Supervisor   server;
     Acceptor     acceptor;
@@ -10,10 +17,7 @@ public class InvokeAsyncTest extends junit.framework.TestCase {
     Target       target;
     Test.Barrier barrier;
 
-    public InvokeAsyncTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -27,6 +31,7 @@ public class InvokeAsyncTest extends junit.framework.TestCase {
         barrier = new Test.Barrier();
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -42,8 +47,8 @@ public class InvokeAsyncTest extends junit.framework.TestCase {
                                                .get(1).asString()));
     }
 
+    @org.junit.Test
     public void testAsync() {
-
         Request req = new Request("concat");
         req.parameters().add(new StringValue("abc"));
         req.parameters().add(new StringValue("def"));
@@ -59,4 +64,5 @@ public class InvokeAsyncTest extends junit.framework.TestCase {
         assertEquals(1, req.returnValues().size());
         assertEquals("abcdef", req.returnValues().get(0).asString());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/InvokeErrorTest.java b/jrt/tests/com/yahoo/jrt/InvokeErrorTest.java
index 71e2ca9d83c..6fe92be97e5 100644
--- a/jrt/tests/com/yahoo/jrt/InvokeErrorTest.java
+++ b/jrt/tests/com/yahoo/jrt/InvokeErrorTest.java
@@ -2,7 +2,14 @@
 package com.yahoo.jrt;
 
 
-public class InvokeErrorTest extends junit.framework.TestCase {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class InvokeErrorTest {
+
     final double timeout=60.0;
     Supervisor   server;
     Acceptor     acceptor;
@@ -10,10 +17,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
     Target       target;
     Test.Barrier barrier;
 
-    public InvokeErrorTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -25,6 +29,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         barrier = new Test.Barrier();
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -51,6 +56,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         barrier.waitFor();
     }
 
+    @org.junit.Test
     public void testNoError() {
         Request req1 = new Request("test");
         req1.parameters().add(new Int32Value(42));
@@ -62,6 +68,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         assertEquals(42, req1.returnValues().get(0).asInt32());
     }
 
+    @org.junit.Test
     public void testNoSuchMethod() {
         Request req1 = new Request("bogus");
         target.invokeSync(req1, timeout);
@@ -70,6 +77,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         assertEquals(ErrorCode.NO_SUCH_METHOD, req1.errorCode());
     }
 
+    @org.junit.Test
     public void testWrongParameters() {
         Request req1 = new Request("test");
         req1.parameters().add(new Int32Value(42));
@@ -99,6 +107,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         assertEquals(ErrorCode.WRONG_PARAMS, req3.errorCode());
     }
 
+    @org.junit.Test
     public void testWrongReturnValues() {
         Request req1 = new Request("test");
         req1.parameters().add(new Int32Value(42));
@@ -110,6 +119,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         assertEquals(ErrorCode.WRONG_RETURN, req1.errorCode());
     }
 
+    @org.junit.Test
     public void testMethodFailed() {
         Request req1 = new Request("test");
         req1.parameters().add(new Int32Value(42));
@@ -130,6 +140,7 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         assertEquals(75000, req2.errorCode());
     }
 
+    @org.junit.Test
     public void testConnectionError() {
         Test.Waiter w = new Test.Waiter();
         Request req1 = new Request("test_barrier");
@@ -146,4 +157,5 @@ public class InvokeErrorTest extends junit.framework.TestCase {
         assertEquals(0, req1.returnValues().size());
         assertEquals(ErrorCode.CONNECTION, req1.errorCode());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/InvokeSyncTest.java b/jrt/tests/com/yahoo/jrt/InvokeSyncTest.java
index c3a27368264..37856c0db81 100644
--- a/jrt/tests/com/yahoo/jrt/InvokeSyncTest.java
+++ b/jrt/tests/com/yahoo/jrt/InvokeSyncTest.java
@@ -8,19 +8,21 @@ import java.io.IOException;
 import java.io.PrintStream;
 
 import com.yahoo.jrt.tool.RpcInvoker;
+import org.junit.After;
+import org.junit.Before;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-public class InvokeSyncTest extends junit.framework.TestCase {
+
+public class InvokeSyncTest {
 
     Supervisor server;
     Acceptor   acceptor;
     Supervisor client;
     Target     target;
     
-    public InvokeSyncTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -35,6 +37,7 @@ public class InvokeSyncTest extends junit.framework.TestCase {
                           .methodDesc("Method taking all types of params"));
     }
 
+    @After
     public void tearDown() {
         System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
         target.close();
@@ -54,6 +57,7 @@ public class InvokeSyncTest extends junit.framework.TestCase {
         req.returnValues().add(new StringValue("This was alltypes. The string param was: "+req.parameters().get(6).asString()));
     }
     
+    @org.junit.Test
     public void testSync() {
         Request req = new Request("concat");
         req.parameters().add(new StringValue("abc"));
@@ -65,7 +69,8 @@ public class InvokeSyncTest extends junit.framework.TestCase {
         assertEquals(1, req.returnValues().size());
         assertEquals("abcdef", req.returnValues().get(0).asString());
     }
-    
+
+    @org.junit.Test
     public void testRpcInvoker() throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         System.setOut(new PrintStream(baos));
diff --git a/jrt/tests/com/yahoo/jrt/InvokeVoidTest.java b/jrt/tests/com/yahoo/jrt/InvokeVoidTest.java
index f357e6e61b1..d0c0d9c728e 100644
--- a/jrt/tests/com/yahoo/jrt/InvokeVoidTest.java
+++ b/jrt/tests/com/yahoo/jrt/InvokeVoidTest.java
@@ -2,17 +2,20 @@
 package com.yahoo.jrt;
 
 
-public class InvokeVoidTest extends junit.framework.TestCase {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class InvokeVoidTest {
 
     Test.Orb server;
     Acceptor acceptor;
     Test.Orb client;
     Target   target;
 
-    public InvokeVoidTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Test.Orb(new Transport());
         client   = new Test.Orb(new Transport());
@@ -29,6 +32,7 @@ public class InvokeVoidTest extends junit.framework.TestCase {
                          .returnDesc(0, "value", "the stored value"));
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -48,8 +52,8 @@ public class InvokeVoidTest extends junit.framework.TestCase {
         req.returnValues().add(new Int32Value(value));
     }
 
+    @org.junit.Test
     public void testInvokeVoid() {
-
         Request req = new Request("set");
         req.parameters().add(new Int32Value(40));
         target.invokeSync(req, 5.0);
@@ -71,4 +75,5 @@ public class InvokeVoidTest extends junit.framework.TestCase {
         assertTrue(server.readBytes == client.writeBytes);
         assertTrue(client.readBytes == server.writeBytes);
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/ListenTest.java b/jrt/tests/com/yahoo/jrt/ListenTest.java
index 945c76469c8..88fd6f22f24 100644
--- a/jrt/tests/com/yahoo/jrt/ListenTest.java
+++ b/jrt/tests/com/yahoo/jrt/ListenTest.java
@@ -1,23 +1,27 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
+import org.junit.After;
+import org.junit.Before;
 
-public class ListenTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-    Supervisor server;
+public class ListenTest {
 
-    public ListenTest(String name) {
-        super(name);
-    }
+    Supervisor server;
 
+    @Before
     public void setUp() {
         server = new Supervisor(new Transport());
     }
 
+    @After
     public void tearDown() {
         server.transport().shutdown().join();
     }
 
+    @org.junit.Test
     public void testListen() {
         try {
             Acceptor a = server.listen(new Spec(Test.PORT));
@@ -61,6 +65,7 @@ public class ListenTest extends junit.framework.TestCase {
         }
     }
 
+    @org.junit.Test
     public void testBogusListen() {
         try {
             Acceptor a = server.listen(new Spec("bogus"));
@@ -81,6 +86,7 @@ public class ListenTest extends junit.framework.TestCase {
         }
     }
 
+    @org.junit.Test
     public void testListenAnyPort() {
         try {
             Acceptor a = server.listen(new Spec("tcp/0"));
@@ -95,4 +101,5 @@ public class ListenTest extends junit.framework.TestCase {
             assertTrue(false);
         }
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/MandatoryMethodsTest.java b/jrt/tests/com/yahoo/jrt/MandatoryMethodsTest.java
index 8ef983eab55..c61cae18c09 100644
--- a/jrt/tests/com/yahoo/jrt/MandatoryMethodsTest.java
+++ b/jrt/tests/com/yahoo/jrt/MandatoryMethodsTest.java
@@ -2,20 +2,24 @@
 package com.yahoo.jrt;
 
 
+import org.junit.After;
+import org.junit.Before;
+
 import java.util.HashSet;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 
-public class MandatoryMethodsTest extends junit.framework.TestCase {
+public class MandatoryMethodsTest {
 
     Supervisor server;
     Acceptor   acceptor;
     Supervisor client;
     Target     target;
 
-    public MandatoryMethodsTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -23,6 +27,7 @@ public class MandatoryMethodsTest extends junit.framework.TestCase {
         target   = client.connect(new Spec("localhost", Test.PORT));
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -30,8 +35,8 @@ public class MandatoryMethodsTest extends junit.framework.TestCase {
         server.transport().shutdown().join();
     }
 
+    @org.junit.Test
     public void testPing() {
-
         Request req = new Request("frt.rpc.ping");
         target.invokeSync(req, 5.0);
 
@@ -39,8 +44,8 @@ public class MandatoryMethodsTest extends junit.framework.TestCase {
         assertEquals(0, req.returnValues().size());
     }
 
+    @org.junit.Test
     public void testGetMethodList() {
-
         Request req = new Request("frt.rpc.getMethodList");
         target.invokeSync(req, 5.0);
 
@@ -72,6 +77,7 @@ public class MandatoryMethodsTest extends junit.framework.TestCase {
         assertTrue(foundSet.contains("frt.rpc.getMethodInfo"));
     }
 
+    @org.junit.Test
     public void testGetMethodInfo() {
         Request req = new Request("frt.rpc.getMethodInfo");
         req.parameters().add(new StringValue("frt.rpc.getMethodInfo"));
@@ -94,4 +100,5 @@ public class MandatoryMethodsTest extends junit.framework.TestCase {
         assertEquals(7, retName.length);
         assertTrue(retName.length == retDesc.length);
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/PacketTest.java b/jrt/tests/com/yahoo/jrt/PacketTest.java
index 158b80b3ff2..8658cc8d61b 100644
--- a/jrt/tests/com/yahoo/jrt/PacketTest.java
+++ b/jrt/tests/com/yahoo/jrt/PacketTest.java
@@ -1,17 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
-
 import java.nio.ByteBuffer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-public class PacketTest extends junit.framework.TestCase {
-
-    public PacketTest(String name) {
-        super(name);
-    }
-
+public class PacketTest {
 
+    @org.junit.Test
     public void testRequestPacket() {
 
         Values params = new Values();
@@ -53,9 +50,8 @@ public class PacketTest extends junit.framework.TestCase {
         assertEquals(params2.get(0).asInt32(), 123);
     }
 
-
+    @org.junit.Test
     public void testReplyPacket() {
-
         Values ret = new Values();
         ret.add(new Int32Value(123));
 
@@ -90,9 +86,8 @@ public class PacketTest extends junit.framework.TestCase {
         assertEquals(ret2.get(0).asInt32(), 123);
     }
 
-
+    @org.junit.Test
     public void testErrorPacket() {
-
         String errStr = "NSM";
         Packet packet =
             new ErrorPacket(0, 42, ErrorCode.NO_SUCH_METHOD, errStr);
@@ -126,4 +121,5 @@ public class PacketTest extends junit.framework.TestCase {
                      ((ErrorPacket)packet2).errorCode());
         assertEquals(errStr, ((ErrorPacket)packet2).errorMessage());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/QueueTest.java b/jrt/tests/com/yahoo/jrt/QueueTest.java
index 28fcf5c4b53..c3bac34db69 100644
--- a/jrt/tests/com/yahoo/jrt/QueueTest.java
+++ b/jrt/tests/com/yahoo/jrt/QueueTest.java
@@ -1,12 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
-public class QueueTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-    public QueueTest(String name) {
-        super(name);
-    }
+public class QueueTest {
 
+    @org.junit.Test
     public void testEmpty() {
         Queue queue = new Queue();
 
@@ -19,6 +20,7 @@ public class QueueTest extends junit.framework.TestCase {
         assertFalse(queue.dequeue() == null);
     }
 
+    @org.junit.Test
     public void testEnqueueDequeue() {
         Queue queue = new Queue();
         Integer int1 = new Integer(1);
@@ -69,6 +71,7 @@ public class QueueTest extends junit.framework.TestCase {
         assertEquals(queue.size(), 0);
     }
 
+    @org.junit.Test
     public void testFlush() {
         Queue src = new Queue();
         Queue dst = new Queue();
@@ -94,4 +97,5 @@ public class QueueTest extends junit.framework.TestCase {
         assertTrue(dst.dequeue() == int2);
         assertTrue(dst.dequeue() == int3);
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/SchedulerTest.java b/jrt/tests/com/yahoo/jrt/SchedulerTest.java
index 362552754e9..1429dd5e779 100644
--- a/jrt/tests/com/yahoo/jrt/SchedulerTest.java
+++ b/jrt/tests/com/yahoo/jrt/SchedulerTest.java
@@ -1,9 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
+import org.junit.After;
+import org.junit.Before;
+
 import java.util.Random;
 
-public class SchedulerTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class SchedulerTest {
 
     long      now;       // fake time
     Scheduler scheduler;
@@ -88,19 +95,18 @@ public class SchedulerTest extends junit.framework.TestCase {
         }
     }
 
-    public SchedulerTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() {
         now = 0;
         scheduler = new Scheduler(now);
     }
 
+    @After
     public void tearDown() {
         scheduler = null;
     }
 
+    @org.junit.Test
     public void testTimeliness() {
         Random rand = new Random(73201242);
 
@@ -130,6 +136,7 @@ public class SchedulerTest extends junit.framework.TestCase {
         }
     }
 
+    @org.junit.Test
     public void testUnschedule() {
         MyTask t1 = new MyTask(1000);
         MyTask t2 = new MyTask(1000);
@@ -204,6 +211,7 @@ public class SchedulerTest extends junit.framework.TestCase {
         assertEquals(cnt, rt5.cnt());
     }
 
+    @org.junit.Test
     public void testSlowEventLoop() {
         scheduler.checkTasks(now);
         now += 10000;
@@ -235,4 +243,5 @@ public class SchedulerTest extends junit.framework.TestCase {
         }
         assertTrue(cnt2 > 10 && cnt2 < 30);
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/SessionTest.java b/jrt/tests/com/yahoo/jrt/SessionTest.java
index 65e80ae1464..afe14bfb908 100644
--- a/jrt/tests/com/yahoo/jrt/SessionTest.java
+++ b/jrt/tests/com/yahoo/jrt/SessionTest.java
@@ -2,8 +2,14 @@
 package com.yahoo.jrt;
 
 
-public class SessionTest extends junit.framework.TestCase
-    implements SessionHandler {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class SessionTest implements SessionHandler {
 
     private static class Session {
         private static int     cnt   = 0;
@@ -102,10 +108,7 @@ public class SessionTest extends junit.framework.TestCase
     Target        target;
     Test.Receptor receptor;
 
-    public SessionTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         Session.reset();
         server   = new Test.Orb(new Transport());
@@ -127,6 +130,7 @@ public class SessionTest extends junit.framework.TestCase
         receptor = new Test.Receptor();
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -238,6 +242,7 @@ public class SessionTest extends junit.framework.TestCase
         client.transport().sync().sync();
     }
 
+    @org.junit.Test
     public void testConnDownLast() {
         waitState(2, 1, 1, 0, 0, 1, 1, 0, 0);
         assertEquals(2, Session.cnt());
@@ -287,6 +292,7 @@ public class SessionTest extends junit.framework.TestCase
         assertFalse(Session.getError());
     }
 
+    @org.junit.Test
     public void testReqDoneLast() {
         waitState(2, 1, 1, 0, 0, 1, 1, 0, 0);
         assertEquals(2, Session.cnt());
@@ -353,6 +359,7 @@ public class SessionTest extends junit.framework.TestCase
         assertFalse(Session.getError());
     }
 
+    @org.junit.Test
     public void testNeverLive() {
         waitState(2, 1, 1, 0, 0, 1, 1, 0, 0);
         assertEquals(2, Session.cnt());
@@ -392,6 +399,7 @@ public class SessionTest extends junit.framework.TestCase
         assertFalse(Session.getError());
     }
 
+    @org.junit.Test
     public void testTransportDown() {
         waitState(2, 1, 1, 0, 0, 1, 1, 0, 0);
         assertEquals(2, Session.cnt());
@@ -448,4 +456,5 @@ public class SessionTest extends junit.framework.TestCase
         assertEquals(3, client.finiCount);
         assertFalse(Session.getError());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/SlobrokTest.java b/jrt/tests/com/yahoo/jrt/SlobrokTest.java
index dad9614336d..ee15c7cd1de 100644
--- a/jrt/tests/com/yahoo/jrt/SlobrokTest.java
+++ b/jrt/tests/com/yahoo/jrt/SlobrokTest.java
@@ -11,9 +11,14 @@ import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.api.Register;
 import com.yahoo.jrt.slobrok.api.Mirror.Entry;
 import com.yahoo.jrt.slobrok.server.Slobrok;
+import org.junit.After;
+import org.junit.Before;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-public class SlobrokTest extends junit.framework.TestCase {
+
+public class SlobrokTest {
 
     private static class SpecList extends ArrayList<Mirror.Entry> {
         public SpecList add(String name, String spec) {
@@ -32,10 +37,7 @@ public class SlobrokTest extends junit.framework.TestCase {
     String     mySpec   = null;
     Slobrok    slobrok;
 
-    public SlobrokTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         slobroks = new String[1];
@@ -49,6 +51,7 @@ public class SlobrokTest extends junit.framework.TestCase {
         mySpec = new Spec("localhost", acceptor.port()).toString();
     }
 
+    @After
     public void tearDown() {
         register.shutdown();
         mirror.shutdown();
@@ -99,6 +102,7 @@ public class SlobrokTest extends junit.framework.TestCase {
         }
     }
 
+    @org.junit.Test
     public void testSlobrok() {
         String wantName = "A/x/w";
         register.registerName(wantName);
@@ -232,4 +236,5 @@ public class SlobrokTest extends junit.framework.TestCase {
     public static void err(String msg) {
         System.err.println(msg);
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/SpecTest.java b/jrt/tests/com/yahoo/jrt/SpecTest.java
index 010c17c7cf8..bfbab884d74 100644
--- a/jrt/tests/com/yahoo/jrt/SpecTest.java
+++ b/jrt/tests/com/yahoo/jrt/SpecTest.java
@@ -3,12 +3,14 @@ package com.yahoo.jrt;
 
 import java.net.InetSocketAddress;
 
-public class SpecTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
-    public SpecTest(String name) {
-        super(name);
-    }
+public class SpecTest {
 
+    @org.junit.Test
     public void testPort() {
         Spec              spec = new Spec(457);
         InetSocketAddress addr = new InetSocketAddress(457);
@@ -20,6 +22,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertTrue(addr.equals(spec.address()));
     }
 
+    @org.junit.Test
     public void testHostPort() {
         String            host = "localhost";
         Spec              spec = new Spec(host, 457);
@@ -32,6 +35,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertTrue(addr.equals(spec.address()));
     }
 
+    @org.junit.Test
     public void testBogusHostPort() {
         String            host = "bogus.host.name";
         Spec              spec = new Spec(host, 457);
@@ -44,6 +48,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertTrue(addr.equals(spec.address()));
     }
 
+    @org.junit.Test
     public void testSpec1() {
         Spec              spec = new Spec("tcp/localhost:8080");
         InetSocketAddress addr = new InetSocketAddress("localhost", 8080);
@@ -55,6 +60,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertTrue(addr.equals(spec.address()));
     }
 
+    @org.junit.Test
     public void testSpec2() {
         Spec              spec = new Spec("tcp/8080");
         InetSocketAddress addr = new InetSocketAddress(8080);
@@ -66,6 +72,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertTrue(addr.equals(spec.address()));
     }
 
+    @org.junit.Test
     public void testBogusSpec1() {
         Spec spec = new Spec("localhost:8080");
 
@@ -76,6 +83,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertNull(spec.address());
     }
 
+    @org.junit.Test
     public void testBogusSpec2() {
         Spec spec = new Spec("tcp/localhost:xyz");
 
@@ -86,6 +94,7 @@ public class SpecTest extends junit.framework.TestCase {
         assertNull(spec.address());
     }
 
+    @org.junit.Test
     public void testBogusSpec3() {
         Spec spec = new Spec("tcp/localhost:");
 
@@ -95,4 +104,5 @@ public class SpecTest extends junit.framework.TestCase {
         assertNull(spec.host());
         assertNull(spec.address());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/Test.java b/jrt/tests/com/yahoo/jrt/Test.java
index 9b039899125..b538d5729e5 100644
--- a/jrt/tests/com/yahoo/jrt/Test.java
+++ b/jrt/tests/com/yahoo/jrt/Test.java
@@ -1,13 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jrt;
 
-
 import java.util.Arrays;
 
+public class Test {
 
-public class Test extends junit.framework.TestCase {
-
-    public Test(String name) { super(name); }
+    @org.junit.Test
     public void testNothing() {}
 
     // www.random.org [2000, 9999]
@@ -233,4 +231,5 @@ public class Test extends junit.framework.TestCase {
         }
         return true;
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/TimeoutTest.java b/jrt/tests/com/yahoo/jrt/TimeoutTest.java
index ce9bb954d74..d1eb2a9895a 100644
--- a/jrt/tests/com/yahoo/jrt/TimeoutTest.java
+++ b/jrt/tests/com/yahoo/jrt/TimeoutTest.java
@@ -2,7 +2,13 @@
 package com.yahoo.jrt;
 
 
-public class TimeoutTest extends junit.framework.TestCase {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class TimeoutTest {
 
     Supervisor   server;
     Acceptor     acceptor;
@@ -10,10 +16,7 @@ public class TimeoutTest extends junit.framework.TestCase {
     Target       target;
     Test.Barrier barrier;
 
-    public TimeoutTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -27,6 +30,7 @@ public class TimeoutTest extends junit.framework.TestCase {
         barrier = new Test.Barrier();
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -42,6 +46,7 @@ public class TimeoutTest extends junit.framework.TestCase {
                                                .get(1).asString()));
     }
 
+    @org.junit.Test
     public void testTimeout() {
         Request req = new Request("concat");
         req.parameters().add(new StringValue("abc"));
@@ -60,6 +65,7 @@ public class TimeoutTest extends junit.framework.TestCase {
         assertEquals(0, req.returnValues().size());
     }
 
+    @org.junit.Test
     public void testNotTimeout() {
         Request req = new Request("concat");
         req.parameters().add(new StringValue("abc"));
@@ -75,4 +81,5 @@ public class TimeoutTest extends junit.framework.TestCase {
         assertEquals(1, req.returnValues().size());
         assertEquals("abcdef", req.returnValues().get(0).asString());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/ValuesTest.java b/jrt/tests/com/yahoo/jrt/ValuesTest.java
index a7058234170..f70af0d7898 100644
--- a/jrt/tests/com/yahoo/jrt/ValuesTest.java
+++ b/jrt/tests/com/yahoo/jrt/ValuesTest.java
@@ -4,12 +4,12 @@ package com.yahoo.jrt;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-public class ValuesTest extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-    public ValuesTest(String name) {
-        super(name);
-    }
+public class ValuesTest {
 
+    @org.junit.Test
     public void testEmpty() {
         Values src = new Values();
         assertEquals(src.bytes(), 4);
@@ -30,6 +30,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertEquals(v.bytes(), bytes);
     }
 
+    @org.junit.Test
     public void testInt8() {
         int byteSize = 4 + 1 + 1;
         Values src = new Values();
@@ -47,6 +48,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertEquals(dst.get(0).asInt8(), (byte)1);
     }
 
+    @org.junit.Test
     public void testInt8Array() {
         int byteSize = 4 + 1 + 4 + 4;
         Values src = new Values();
@@ -65,6 +67,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asInt8Array(), val));
     }
 
+    @org.junit.Test
     public void testInt16() {
         int byteSize = 4 + 1 + 2;
         Values src = new Values();
@@ -82,6 +85,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertEquals(dst.get(0).asInt16(), (short)2);
     }
 
+    @org.junit.Test
     public void testInt16Array() {
         int byteSize = 4 + 1 + 4 + 4 * 2;
         Values src = new Values();
@@ -100,6 +104,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asInt16Array(), val));
     }
 
+    @org.junit.Test
     public void testInt32() {
         int byteSize = 4 + 1 + 4;
         Values src = new Values();
@@ -117,6 +122,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertEquals(dst.get(0).asInt32(), 4);
     }
 
+    @org.junit.Test
     public void testInt32Array() {
         int byteSize = 4 + 1 + 4 + 4 * 4;
         Values src = new Values();
@@ -135,6 +141,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asInt32Array(), val));
     }
 
+    @org.junit.Test
     public void testInt64() {
         int byteSize = 4 + 1 + 8;
         Values src = new Values();
@@ -152,6 +159,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertEquals(dst.get(0).asInt64(), 8);
     }
 
+    @org.junit.Test
     public void testInt64Array() {
         int byteSize = 4 + 1 + 4 + 4 * 8;
         Values src = new Values();
@@ -170,6 +178,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asInt64Array(), val));
     }
 
+    @org.junit.Test
     public void testFloat() {
         int byteSize = 4 + 1 + 4;
         Values src = new Values();
@@ -187,6 +196,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(dst.get(0).asFloat() == (float)2.5);
     }
 
+    @org.junit.Test
     public void testFloatArray() {
         int byteSize = 4 + 1 + 4 + 4 * 4;
         Values src = new Values();
@@ -205,6 +215,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asFloatArray(), val));
     }
 
+    @org.junit.Test
     public void testDouble() {
         int byteSize = 4 + 1 + 8;
         Values src = new Values();
@@ -222,6 +233,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(dst.get(0).asDouble() == 3.75);
     }
 
+    @org.junit.Test
     public void testDoubleArray() {
         int byteSize = 4 + 1 + 4 + 4 * 8;
         Values src = new Values();
@@ -240,6 +252,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asDoubleArray(), val));
     }
 
+    @org.junit.Test
     public void testData() {
         int byteSize = 4 + 1 + 4 + 4;
         Values src = new Values();
@@ -258,6 +271,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asData(), val));
     }
 
+    @org.junit.Test
     public void testDataArray() {
         int byteSize = 4 + 1 + 4 + 4 * (4 + 4);
         Values src = new Values();
@@ -282,6 +296,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(dst.get(0).asDataArray()[3], val[3]));
     }
 
+    @org.junit.Test
     public void testString1() {
         int byteSize = 4 + 1 + 4 + 4;
         Values src = new Values();
@@ -300,6 +315,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(dst.get(0).asString().equals("test"));
     }
 
+    @org.junit.Test
     public void testString2() {
         int byteSize = 4 + 1 + 4 + 7;
         Values src = new Values();
@@ -328,6 +344,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(dst.get(0).asString().equals("H\u00E5vard"));
     }
 
+    @org.junit.Test
     public void testStringArray() {
         int byteSize = 4 + 1 + 4 + 4 * 4 + 3 + 3 + 5 + 4;
         Values src = new Values();
@@ -349,6 +366,7 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(dst.get(0).asStringArray()[3].equals("four"));
     }
 
+    @org.junit.Test
     public void testAllValues() {
         int byteSize =
             4 + 16                       // typestring
@@ -432,4 +450,5 @@ public class ValuesTest extends junit.framework.TestCase {
         assertTrue(dst.get(15).asStringArray()[2].equals("three"));
         assertTrue(dst.get(15).asStringArray()[3].equals("four"));
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/WatcherTest.java b/jrt/tests/com/yahoo/jrt/WatcherTest.java
index 679f87b04d9..591a55662f0 100644
--- a/jrt/tests/com/yahoo/jrt/WatcherTest.java
+++ b/jrt/tests/com/yahoo/jrt/WatcherTest.java
@@ -2,7 +2,14 @@
 package com.yahoo.jrt;
 
 
-public class WatcherTest extends junit.framework.TestCase {
+import org.junit.After;
+import org.junit.Before;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class WatcherTest {
 
     private static class Watcher implements TargetWatcher {
         private int notifyCnt = 0;
@@ -25,10 +32,7 @@ public class WatcherTest extends junit.framework.TestCase {
     Supervisor client;
     Target     target;
 
-    public WatcherTest(String name) {
-        super(name);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException {
         server   = new Supervisor(new Transport());
         client   = new Supervisor(new Transport());
@@ -36,6 +40,7 @@ public class WatcherTest extends junit.framework.TestCase {
         target   = client.connect(new Spec("localhost", Test.PORT));
     }
 
+    @After
     public void tearDown() {
         target.close();
         acceptor.shutdown().join();
@@ -43,6 +48,7 @@ public class WatcherTest extends junit.framework.TestCase {
         server.transport().shutdown().join();
     }
 
+    @org.junit.Test
     public void testNotify() {
         Watcher w1 = new Watcher();
         Watcher w2 = new Watcher();
@@ -95,4 +101,5 @@ public class WatcherTest extends junit.framework.TestCase {
         assertEquals(0, w4.cnt());
         assertEquals(0, w5.cnt());
     }
+
 }
diff --git a/jrt/tests/com/yahoo/jrt/tool/RpcInvokerTest.java b/jrt/tests/com/yahoo/jrt/tool/RpcInvokerTest.java
index 7b1d37b1ba4..6e2d02d548b 100644
--- a/jrt/tests/com/yahoo/jrt/tool/RpcInvokerTest.java
+++ b/jrt/tests/com/yahoo/jrt/tool/RpcInvokerTest.java
@@ -2,33 +2,36 @@
 package com.yahoo.jrt.tool;
 
 import com.yahoo.jrt.Request;
+import org.junit.Test;
 
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author bratseth
  */
-public class RpcInvokerTest extends junit.framework.TestCase {
-
-    public RpcInvokerTest(String name) {
-        super(name);
-    }
+public class RpcInvokerTest {
 
+    @Test
     public void test0Args() {
         assertCorrectArguments("");
     }
 
+    @Test
     public void test1StringShorthanArgs() {
         assertCorrectArguments("foo");
     }
 
+    @Test
     public void test2StringArgs() {
         assertCorrectArguments("s:foo s:bar");
     }
 
+    @Test
     public void test2StringShorthandArgs() {
         assertCorrectArguments("foo bar");
     }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java
index a4bb5694a31..585ce2913c0 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ChokeTestCase.java
@@ -10,11 +10,8 @@ import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
-import com.yahoo.net.HostName;
-import junit.framework.TestCase;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.net.UnknownHostException;
@@ -36,7 +33,7 @@ public class ChokeTestCase {
     DestinationSession dstSession;
 
     @Before
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()),
                                    new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok)));
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java
index 7901778e86b..e67b33f2303 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/RateThrottlingTestCase.java
@@ -2,10 +2,14 @@
 package com.yahoo.messagebus;
 
 import com.yahoo.messagebus.test.SimpleMessage;
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class RateThrottlingTestCase extends TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
+public class RateThrottlingTestCase {
+
+    @Test
     public void testPending() {
         CustomTimer timer = new CustomTimer();
         RateThrottlingPolicy policy = new RateThrottlingPolicy(5.0, timer);
@@ -30,10 +34,12 @@ public class RateThrottlingTestCase extends TestCase {
         return ok;
     }
 
+    @Test
     public void testRates() {
         assertEquals(10, getActualRate(0.1), 1);
         assertEquals(1000, getActualRate(10), 100);
         assertEquals(500, getActualRate(5), 50);
         assertEquals(100, getActualRate(1), 10);
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java
index b760ee6d13f..7738b46e912 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/RoutableTestCase.java
@@ -8,12 +8,22 @@ import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleReply;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 
-public class RoutableTestCase extends junit.framework.TestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
-    public void testMessageContext() throws ListenFailedException, UnknownHostException {
+public class RoutableTestCase {
+
+    private final double delta = 0.00000001;
+
+    @Test
+    public void testMessageContext() throws ListenFailedException {
         Slobrok slobrok = new Slobrok();
         TestServer srcServer = new TestServer("src", null, slobrok, null);
         TestServer dstServer = new TestServer("dst", null, slobrok, null);
@@ -43,6 +53,7 @@ public class RoutableTestCase extends junit.framework.TestCase {
         slobrok.stop();
     }
 
+    @Test
     public void testMessageSwapState() {
         Message foo = new SimpleMessage("foo");
         Route fooRoute = Route.parse("foo");
@@ -68,6 +79,7 @@ public class RoutableTestCase extends junit.framework.TestCase {
         assertEquals(2, bar.getTimeRemaining());
     }
 
+    @Test
     public void testReplySwapState() {
         Reply foo = new SimpleReply("foo");
         Message fooMsg = new SimpleMessage("foo");
@@ -85,12 +97,13 @@ public class RoutableTestCase extends junit.framework.TestCase {
         foo.swapState(bar);
         assertEquals(barMsg, foo.getMessage());
         assertEquals(fooMsg, bar.getMessage());
-        assertEquals(2.0, foo.getRetryDelay());
-        assertEquals(1.0, bar.getRetryDelay());
+        assertEquals(2.0, foo.getRetryDelay(), delta);
+        assertEquals(1.0, bar.getRetryDelay(), delta);
         assertEquals(1, foo.getNumErrors());
         assertEquals(2, bar.getNumErrors());
     }
 
+    @Test
     public void testMessageDiscard() {
         Receptor handler = new Receptor();
         Message msg = new SimpleMessage("foo");
@@ -100,6 +113,7 @@ public class RoutableTestCase extends junit.framework.TestCase {
         assertNull(handler.getReply(0));
     }
 
+    @Test
     public void testReplyDiscard() {
         Receptor handler = new Receptor();
         Message msg = new SimpleMessage("foo");
@@ -111,4 +125,5 @@ public class RoutableTestCase extends junit.framework.TestCase {
 
         assertNull(handler.getReply(0));
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java
index cfac45d0df2..fe9611b0a37 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/SendProxyTestCase.java
@@ -14,24 +14,31 @@ import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
 import com.yahoo.messagebus.test.SimpleReply;
 import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-import java.net.UnknownHostException;
 import java.util.logging.Handler;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class SendProxyTestCase extends TestCase {
+public class SendProxyTestCase {
 
     Slobrok slobrok;
     TestServer srcServer, dstServer;
     SourceSession srcSession;
     DestinationSession dstSession;
 
-    @Override
-    public void setUp() throws UnknownHostException, ListenFailedException {
+    @Before
+    public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()),
                                    new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok)));
@@ -43,7 +50,7 @@ public class SendProxyTestCase extends TestCase {
         assertTrue(srcServer.waitSlobrok("dst/session", 1));
     }
 
-    @Override
+    @After
     public void tearDown() {
         slobrok.stop();
         dstSession.destroy();
@@ -52,6 +59,7 @@ public class SendProxyTestCase extends TestCase {
         srcServer.destroy();
     }
 
+    @Test
     public void testTraceByLogLevel() {
         Logger log = Logger.getLogger(SendProxy.class.getName());
         LogHandler logHandler = new LogHandler();
@@ -166,4 +174,5 @@ public class SendProxyTestCase extends TestCase {
             // empty
         }
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java
index e8c74f77e48..562243b8b79 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/SequencerTestCase.java
@@ -2,15 +2,21 @@
 package com.yahoo.messagebus;
 
 import com.yahoo.messagebus.test.SimpleMessage;
+import org.junit.Test;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class SequencerTestCase extends junit.framework.TestCase {
+public class SequencerTestCase {
 
+    @Test
     public void testSyncNone() {
         TestQueue src = new TestQueue();
         TestQueue dst = new TestQueue();
@@ -42,6 +48,7 @@ public class SequencerTestCase extends junit.framework.TestCase {
         assertEquals(0, dst.size());
     }
 
+    @Test
     public void testSyncId() {
         TestQueue src = new TestQueue();
         TestQueue dst = new TestQueue();
@@ -175,5 +182,6 @@ public class SequencerTestCase extends junit.framework.TestCase {
             return seqId;
         }
     }
+
 }
 
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java
index 433183f227a..b0d61268e76 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/SimpleTripTestCase.java
@@ -11,15 +11,19 @@ import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
 import com.yahoo.messagebus.test.SimpleReply;
+import org.junit.Test;
 
-import java.net.UnknownHostException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class SimpleTripTestCase extends junit.framework.TestCase {
+public class SimpleTripTestCase {
 
-    public void testSimpleTrip() throws ListenFailedException, UnknownHostException {
+    @Test
+    public void testSimpleTrip() throws ListenFailedException {
         Slobrok slobrok = new Slobrok();
         TestServer server = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()),
                                            new RPCNetworkParams()
@@ -50,4 +54,5 @@ public class SimpleTripTestCase extends junit.framework.TestCase {
         dst.destroy();
         server.destroy();
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
index 6c298f5f3b5..4e3520f2419 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/ThrottlerTestCase.java
@@ -5,26 +5,32 @@ import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.RoutingTableSpec;
-import com.yahoo.messagebus.test.*;
+import com.yahoo.messagebus.test.QueueAdapter;
+import com.yahoo.messagebus.test.Receptor;
+import com.yahoo.messagebus.test.SimpleMessage;
+import com.yahoo.messagebus.test.SimpleProtocol;
+import com.yahoo.messagebus.test.SimpleReply;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-import java.net.UnknownHostException;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class ThrottlerTestCase extends junit.framework.TestCase {
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Setup
-    //
-    ////////////////////////////////////////////////////////////////////////////////
+public class ThrottlerTestCase {
 
     Slobrok slobrok;
     TestServer src, dst;
 
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    @Before
+    public void setUp() throws ListenFailedException {
         RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME);
         table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"));
         table.addRoute("test", Arrays.asList("dst"));
@@ -33,18 +39,14 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
         dst = new TestServer("test/dst", table, slobrok, null);
     }
 
+    @After
     public void tearDown() {
         dst.destroy();
         src.destroy();
         slobrok.stop();
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Tests
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
+    @Test
     public void testMaxCount() {
         // Prepare a source session with throttle enabled.
         SourceSessionParams params = new SourceSessionParams().setTimeout(600.0);
@@ -85,6 +87,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
         dst_s.destroy();
     }
 
+    @Test
     public void testMaxSize() {
         // Prepare a source session with throttle enabled.
         SourceSessionParams params = new SourceSessionParams().setTimeout(600.0);
@@ -125,6 +128,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
         dst_s.destroy();
     }
 
+    @Test
     public void testDynamicWindowSize() {
         CustomTimer timer = new CustomTimer();
         DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer);
@@ -146,8 +150,9 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
 
         windowSize = getWindowSize(policy, timer, 100);
         assertTrue(windowSize >= 90 && windowSize <= 115);
-  }
+    }
 
+    @Test
     public void testIdleTimePeriod() {
         CustomTimer timer = new CustomTimer();
         DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer);
@@ -173,6 +178,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
 
     }
 
+    @Test
     public void testMinWindowSize() {
         CustomTimer timer = new CustomTimer();
         DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer);
@@ -185,6 +191,7 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
         assertTrue(windowSize >= 150 && windowSize <= 210);
     }
 
+    @Test
     public void testMaxWindowSize() {
         CustomTimer timer = new CustomTimer();
         DynamicThrottlePolicy policy = new DynamicThrottlePolicy(timer);
@@ -197,13 +204,6 @@ public class ThrottlerTestCase extends junit.framework.TestCase {
         assertTrue(windowSize >= 40 && windowSize <= 50);
     }
 
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
     private int getWindowSize(DynamicThrottlePolicy policy, CustomTimer timer, int maxPending) {
         Message msg = new SimpleMessage("foo");
         Reply reply = new SimpleReply("bar");
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java
index 65175fe4e98..f0a8a127492 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTestCase.java
@@ -1,11 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.messagebus;
 
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class TraceTestCase extends junit.framework.TestCase {
+public class TraceTestCase {
 
+    @Test
     public void testEncodeDecode() {
         assertEquals("()", TraceNode.decode("").encode());
         assertEquals("()", TraceNode.decode("[xyz").encode());
@@ -91,6 +97,7 @@ public class TraceTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testReservedChars() {
         TraceNode t = new TraceNode();
         t.addChild("abc(){}[]\\xyz");
@@ -109,6 +116,7 @@ public class TraceTestCase extends junit.framework.TestCase {
         }
     }
 
+    @Test
     public void testAdd() {
         TraceNode t1 = TraceNode.decode("([x])");
         TraceNode t2 = TraceNode.decode("([y])");
@@ -128,12 +136,14 @@ public class TraceTestCase extends junit.framework.TestCase {
         assertEquals("([y]([y])([y]([y])))", t2.encode());
     }
 
+    @Test
     public void testStrict() {
         assertEquals("{}", TraceNode.decode("()").setStrict(false).encode());
         assertEquals("{[x]}", TraceNode.decode("([x])").setStrict(false).encode());
         assertEquals("{[x][y]}", TraceNode.decode("([x][y])").setStrict(false).encode());
     }
 
+    @Test
     public void testTraceLevel() {
         Trace t = new Trace();
         t.setLevel(4);
@@ -160,6 +170,7 @@ public class TraceTestCase extends junit.framework.TestCase {
         assertEquals(5, t.getRoot().getNumChildren());
     }
 
+    @Test
     public void testCompact() {
         assertEquals("()", TraceNode.decode("()").compact().encode());
         assertEquals("()", TraceNode.decode("(())").compact().encode());
@@ -189,6 +200,7 @@ public class TraceTestCase extends junit.framework.TestCase {
         assertEquals("({[a][b][c][d][e][f]})", TraceNode.decode("({({[a][b]})({[c][d]})({[e][f]})})").compact().encode());
     }
 
+    @Test
     public void testSort() {
         assertEquals("([b][a][c])", TraceNode.decode("([b][a][c])").sort().encode());
         assertEquals("({[a][b][c]})", TraceNode.decode("({[b][a][c]})").sort().encode());
@@ -198,6 +210,7 @@ public class TraceTestCase extends junit.framework.TestCase {
         assertEquals("({([b]){[a][c]}})", TraceNode.decode("({{[c][a]}([b])})").sort().encode());
     }
 
+    @Test
     public void testNormalize() {
         TraceNode t1 = TraceNode.decode("({([a][b]{[x][y]([p][q])})([c][d])([e][f])})");
         TraceNode t2 = TraceNode.decode("({([a][b]{[y][x]([p][q])})([c][d])([e][f])})");
@@ -238,6 +251,7 @@ public class TraceTestCase extends junit.framework.TestCase {
         assertEquals("({([c][d])([e][f])([a][b]{[x][y]([p][q])})})", t1.normalize().encode());
     }
 
+    @Test
     public void testTraceDump() {
         {
             Trace big = new Trace();
@@ -283,4 +297,5 @@ public class TraceTestCase extends junit.framework.TestCase {
             assertEquals(s2.toString(27), s2.toString());
         }
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
index 007f7a70d14..1f16e9bb5af 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/TraceTripTestCase.java
@@ -8,25 +8,27 @@ import com.yahoo.messagebus.routing.RoutingTableSpec;
 import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class TraceTripTestCase extends junit.framework.TestCase {
+public class TraceTripTestCase {
 
     Slobrok slobrok;
     TestServer src;
     TestServer pxy;
     TestServer dst;
 
-    public TraceTripTestCase(String message) {
-        super(message);
-    }
-
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    @Before
+    public void setUp() throws ListenFailedException {
         RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME)
                                  .addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session"))
                                  .addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"))
@@ -38,6 +40,7 @@ public class TraceTripTestCase extends junit.framework.TestCase {
         dst = new TestServer("test/dst", table, slobrok, null);
     }
 
+    @After
     public void tearDown() {
         dst.destroy();
         pxy.destroy();
@@ -45,6 +48,7 @@ public class TraceTripTestCase extends junit.framework.TestCase {
         slobrok.stop();
     }
 
+    @Test
     public void testTrip() {
         Receptor src_rr = new Receptor();
         SourceSession src_s = src.mb.createSourceSession(src_rr);
@@ -113,4 +117,5 @@ public class TraceTripTestCase extends junit.framework.TestCase {
             session.reply(reply);
         }
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
index 603d8433524..0aef3f3e994 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/BasicNetworkTestCase.java
@@ -13,22 +13,30 @@ import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
 import com.yahoo.messagebus.test.SimpleReply;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 import java.util.Arrays;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 
 /**
- * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a>
+ * @author havardpe
  */
-public class BasicNetworkTestCase extends junit.framework.TestCase {
+public class BasicNetworkTestCase {
 
     Slobrok     slobrok;
     TestServer src;
     TestServer  pxy;
     TestServer  dst;
 
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    @Before
+    public void setUp() throws ListenFailedException {
         RoutingTableSpec table = new RoutingTableSpec(SimpleProtocol.NAME);
         table.addHop("pxy", "test/pxy/session", Arrays.asList("test/pxy/session"));
         table.addHop("dst", "test/dst/session", Arrays.asList("test/dst/session"));
@@ -39,6 +47,7 @@ public class BasicNetworkTestCase extends junit.framework.TestCase {
         dst = new TestServer("test/dst", table, slobrok, null);
     }
 
+    @After
     public void tearDown() {
         dst.destroy();
         pxy.destroy();
@@ -46,6 +55,7 @@ public class BasicNetworkTestCase extends junit.framework.TestCase {
         slobrok.stop();
     }
 
+    @Test
     public void testNetwork() {
         // set up receptors
         Receptor src_rr = new Receptor();
@@ -115,6 +125,7 @@ public class BasicNetworkTestCase extends junit.framework.TestCase {
         ds.destroy();
     }
 
+    @Test
     public void testTimeoutsFollowMessage() {
         SourceSessionParams params = new SourceSessionParams().setTimeout(600.0);
         SourceSession ss = src.mb.createSourceSession(new Receptor(), params);
@@ -149,4 +160,5 @@ public class BasicNetworkTestCase extends junit.framework.TestCase {
         ss.destroy();
         ds.destroy();
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java
index c9a4c38a682..6cb0736f6fa 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/LoadBalanceTestCase.java
@@ -9,15 +9,20 @@ import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.Route;
 import com.yahoo.messagebus.test.QueueAdapter;
 import com.yahoo.messagebus.test.SimpleMessage;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a>
+ * @author havardpe
  */
-public class LoadBalanceTestCase extends junit.framework.TestCase {
+public class LoadBalanceTestCase {
 
-    public void testLoadBalance() throws ListenFailedException, UnknownHostException {
+    @Test
+    public void testLoadBalance() throws ListenFailedException {
         Slobrok slobrok = new Slobrok();
         TestServer src = new TestServer("src", null, slobrok, null);
         TestServer dst1 = new TestServer("dst/1", null, slobrok, null);
@@ -93,4 +98,5 @@ public class LoadBalanceTestCase extends junit.framework.TestCase {
             return cnt;
         }
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java
index 073ad531bdd..82a03d06c6c 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServiceAddressTestCase.java
@@ -6,21 +6,26 @@ import com.yahoo.jrt.Spec;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.messagebus.network.Identity;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class ServiceAddressTestCase extends junit.framework.TestCase {
+public class ServiceAddressTestCase {
 
     private Slobrok slobrok;
     private RPCNetwork network;
 
-    public ServiceAddressTestCase(String msg) {
-        super(msg);
-    }
-
+    @Before
     public void setUp() throws ListenFailedException, UnknownHostException {
         slobrok = new Slobrok();
         network = new RPCNetwork(new RPCNetworkParams()
@@ -29,11 +34,13 @@ public class ServiceAddressTestCase extends junit.framework.TestCase {
                                                      new Spec("localhost", slobrok.port()).toString() + "\"\n"));
     }
 
+    @After
     public void tearDown() {
         network.shutdown();
         slobrok.stop();
     }
 
+    @Test
     public void testAddrServiceAddress() {
         assertNullAddress("tcp");
         assertNullAddress("tcp/");
@@ -47,6 +54,7 @@ public class ServiceAddressTestCase extends junit.framework.TestCase {
         assertNullAddress("tcp/:/session");
     }
 
+    @Test
     public void testNameServiceAddress() {
         network.unregisterSession("session");
         assertTrue(waitSlobrok("foo/session", 0));
@@ -87,4 +95,5 @@ public class ServiceAddressTestCase extends junit.framework.TestCase {
             assertEquals(expectedSession, obj.getSessionName());
         }
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java
index b5c64c5ea6b..9bc9ef41af9 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/ServicePoolTestCase.java
@@ -4,13 +4,17 @@ package com.yahoo.messagebus.network.rpc;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class ServicePoolTestCase extends TestCase {
+public class ServicePoolTestCase {
 
+    @Test
     public void testMaxSize() throws ListenFailedException {
         Slobrok slobrok = new Slobrok();
         RPCNetwork net = new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok)));
@@ -54,4 +58,5 @@ public class ServicePoolTestCase extends TestCase {
 
         slobrok.stop();
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java
index 0c4e55b5001..c6737385f4c 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SlobrokTestCase.java
@@ -7,6 +7,9 @@ import com.yahoo.jrt.Spec;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.messagebus.network.Identity;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -14,11 +17,13 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 
+import static org.junit.Assert.assertTrue;
+
 
 /**
- * @author <a href="mailto:havardpe@yahoo-inc.com">Haavard Pettersen</a>
+ * @author havardpe
  */
-public class SlobrokTestCase extends junit.framework.TestCase {
+public class SlobrokTestCase {
 
     private static class Res {
         private List<Mirror.Entry> lst = new ArrayList<>();
@@ -31,11 +36,6 @@ public class SlobrokTestCase extends junit.framework.TestCase {
         }
     }
 
-
-    public SlobrokTestCase(String message) {
-        super(message);
-    }
-
     Slobrok    slobrok;
     RPCNetwork net1;
     RPCNetwork net2;
@@ -83,7 +83,8 @@ public class SlobrokTestCase extends junit.framework.TestCase {
         assertTrue(false);
     }
 
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    @Before
+    public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         String slobrokCfgId = "raw:slobrok[1]\nslobrok[0].connectionspec \"" + new Spec("localhost", slobrok.port()).toString() + "\"\n";
         net1 = new RPCNetwork(new RPCNetworkParams().setIdentity(new Identity("net/a")).setSlobrokConfigId(slobrokCfgId));
@@ -94,6 +95,7 @@ public class SlobrokTestCase extends junit.framework.TestCase {
         port3 = net3.getPort();
     }
 
+    @After
     public void tearDown() {
         net3.shutdown();
         net2.shutdown();
@@ -101,6 +103,7 @@ public class SlobrokTestCase extends junit.framework.TestCase {
         slobrok.stop();
     }
 
+    @Test
     public void testSlobrok() {
         net1.registerSession("foo");
         net2.registerSession("foo");
@@ -148,4 +151,5 @@ public class SlobrokTestCase extends junit.framework.TestCase {
               .add("net/b/foo", net2.getConnectionSpec())
               .add("net/c/foo", net3.getConnectionSpec()).toArray());
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java
index 26b32eeb418..626cb7031d8 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/TargetPoolTestCase.java
@@ -7,28 +7,34 @@ import com.yahoo.jrt.Transport;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.concurrent.Timer;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class TargetPoolTestCase extends junit.framework.TestCase {
+public class TargetPoolTestCase {
 
     private Slobrok slobrok;
     private List<TestServer> servers;
     private Supervisor orb;
 
-    @Override
+    @Before
     public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         servers = new ArrayList<>();
         orb = new Supervisor(new Transport());
     }
 
-    @Override
+    @After
     public void tearDown() {
         slobrok.stop();
         for (TestServer server : servers) {
@@ -37,6 +43,7 @@ public class TargetPoolTestCase extends junit.framework.TestCase {
         orb.transport().shutdown().join();
     }
 
+    @Test
     public void testConnectionExpire() throws ListenFailedException, UnknownHostException {
         // Necessary setup to be able to resolve targets.
         RPCServiceAddress adr1 = registerServer();
@@ -96,7 +103,7 @@ public class TargetPoolTestCase extends junit.framework.TestCase {
         assertEquals(0, pool.size());
     }
 
-    private RPCServiceAddress registerServer() throws ListenFailedException, UnknownHostException {
+    private RPCServiceAddress registerServer() {
         servers.add(new TestServer("srv" + servers.size(), null, slobrok, null));
         return new RPCServiceAddress("foo/bar", servers.get(servers.size() - 1).mb.getConnectionSpec());
     }
@@ -109,4 +116,5 @@ public class TargetPoolTestCase extends junit.framework.TestCase {
             return millis;
         }
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java
index d255c3cff6d..bd90107f52e 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/AdvancedRoutingTestCase.java
@@ -3,8 +3,16 @@ package com.yahoo.messagebus.routing;
 
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Error;
+import com.yahoo.messagebus.ErrorCode;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.network.Identity;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
@@ -12,27 +20,29 @@ import com.yahoo.messagebus.routing.test.CustomPolicyFactory;
 import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.UnknownHostException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class AdvancedRoutingTestCase extends junit.framework.TestCase {
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Setup
-    //
-    ////////////////////////////////////////////////////////////////////////////////
+public class AdvancedRoutingTestCase {
 
     Slobrok slobrok;
     TestServer srcServer, dstServer;
     SourceSession srcSession;
     DestinationSession dstFoo, dstBar, dstBaz;
 
-    @Override
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    @Before
+    public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()),
                                    new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok)));
@@ -46,7 +56,7 @@ public class AdvancedRoutingTestCase extends junit.framework.TestCase {
         assertTrue(srcServer.waitSlobrok("dst/*", 3));
     }
 
-    @Override
+    @After
     public void tearDown() {
         slobrok.stop();
         dstFoo.destroy();
@@ -57,12 +67,7 @@ public class AdvancedRoutingTestCase extends junit.framework.TestCase {
         srcServer.destroy();
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Tests
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
+    @Test
     public void testAdvanced() {
         SimpleProtocol protocol = new SimpleProtocol();
         protocol.addPolicyFactory("Custom", new CustomPolicyFactory(false, ErrorCode.NO_ADDRESS_FOR_SERVICE));
@@ -116,4 +121,5 @@ public class AdvancedRoutingTestCase extends junit.framework.TestCase {
         assertEquals(ErrorCode.FATAL_ERROR, reply.getError(0).getCode());
         assertEquals(ErrorCode.NO_ADDRESS_FOR_SERVICE, reply.getError(1).getCode());
     }
+
 }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java
index 9d63e9719ab..fcf3923c940 100755
--- a/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/routing/ResenderTestCase.java
@@ -3,27 +3,36 @@ package com.yahoo.messagebus.routing;
 
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Error;
+import com.yahoo.messagebus.ErrorCode;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.network.Identity;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.test.Receptor;
 import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-import java.net.UnknownHostException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
-public class ResenderTestCase extends junit.framework.TestCase {
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Setup
-    //
-    ////////////////////////////////////////////////////////////////////////////////
+public class ResenderTestCase {
 
     Slobrok slobrok;
     TestServer srcServer, dstServer;
@@ -31,8 +40,8 @@ public class ResenderTestCase extends junit.framework.TestCase {
     DestinationSession dstSession;
     RetryTransientErrorsPolicy retryPolicy;
 
-    @Override
-    public void setUp() throws ListenFailedException, UnknownHostException {
+    @Before
+    public void setUp() throws ListenFailedException {
         slobrok = new Slobrok();
         dstServer = new TestServer(new MessageBusParams().addProtocol(new SimpleProtocol()),
                                    new RPCNetworkParams().setIdentity(new Identity("dst")).setSlobrokConfigId(TestServer.getSlobrokConfig(slobrok)));
@@ -46,7 +55,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         assertTrue(srcServer.waitSlobrok("dst/session", 1));
     }
 
-    @Override
+    @After
     public void tearDown() {
         slobrok.stop();
         dstSession.destroy();
@@ -55,12 +64,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         srcServer.destroy();
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Tests
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
+    @Test
     public void testRetryTag() {
         assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted());
         Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60);
@@ -79,6 +83,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         System.out.println(reply.getTrace());
     }
 
+    @Test
     public void testRetryEnabledTag() {
         Message msg = createMessage("msg");
         msg.setRetryEnabled(false);
@@ -93,6 +98,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         System.out.println(reply.getTrace());
     }
 
+    @Test
     public void testTransientError() {
         assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted());
         Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60);
@@ -106,6 +112,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0));
     }
 
+    @Test
     public void testFatalError() {
         assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted());
         Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60);
@@ -117,6 +124,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0));
     }
 
+    @Test
     public void testDisableRetry() {
         retryPolicy.setEnabled(false);
         assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted());
@@ -130,6 +138,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         assertNull(((Receptor)dstSession.getMessageHandler()).getMessage(0));
     }
 
+    @Test
     public void testRetryDelay() {
         retryPolicy.setBaseDelay(0.01);
         assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted());
@@ -153,6 +162,7 @@ public class ResenderTestCase extends junit.framework.TestCase {
         assertTrue(trace.contains("retry 5 in 0.05"));
     }
 
+    @Test
     public void testRequestRetryDelay() {
         assertTrue(srcSession.send(createMessage("msg"), Route.parse("dst/session")).isAccepted());
         Message msg = ((Receptor)dstSession.getMessageHandler()).getMessage(60);
@@ -176,12 +186,6 @@ public class ResenderTestCase extends junit.framework.TestCase {
         assertTrue(trace.contains("retry 5 in 0.08"));
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-
     private static Message createMessage(String msg) {
         SimpleMessage ret = new SimpleMessage(msg);
         ret.getTrace().setLevel(9);
@@ -197,4 +201,5 @@ public class ResenderTestCase extends junit.framework.TestCase {
         reply.setRetryDelay(retryDelay);
         dstSession.reply(reply);
     }
+
 }