diff --git a/ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java b/ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
index 81a14d86cc..f51c7420b8 100644
--- a/ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
+++ b/ntcore/src/test/java/edu/wpi/first/networktables/ConnectionListenerTest.java
@@ -10,14 +10,24 @@ package edu.wpi.first.networktables;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
-public class ConnectionListenerTest extends TestCase {
-  NetworkTableInstance m_serverInst;
-  NetworkTableInstance m_clientInst;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
-  @Override
-  protected void setUp() throws Exception {
+class ConnectionListenerTest {
+  private NetworkTableInstance m_serverInst;
+  private NetworkTableInstance m_clientInst;
+
+  @BeforeEach
+  void setUp() {
     m_serverInst = NetworkTableInstance.create();
     m_serverInst.setNetworkIdentity("server");
 
@@ -25,8 +35,8 @@ public class ConnectionListenerTest extends TestCase {
     m_clientInst.setNetworkIdentity("client");
   }
 
-  @Override
-  protected void tearDown() throws Exception {
+  @AfterEach
+  void tearDown() {
     m_clientInst.close();
     m_serverInst.close();
   }
@@ -49,15 +59,14 @@ public class ConnectionListenerTest extends TestCase {
     }
   }
 
-  /**
-   * Test the JNI.
-   */
-  public void testJNI() {
+  @Test
+  @DisabledOnOs(OS.WINDOWS)
+  void testJNI() {
     // set up the poller
     int poller = NetworkTablesJNI.createConnectionListenerPoller(m_serverInst.getHandle());
-    assertTrue("bad poller handle", poller != 0);
+    assertTrue(poller != 0, "bad poller handle");
     int handle = NetworkTablesJNI.addPolledConnectionListener(poller, false);
-    assertTrue("bad listener handle", handle != 0);
+    assertTrue(handle != 0, "bad listener handle");
 
     // trigger a connect event
     connect();
@@ -73,7 +82,7 @@ public class ConnectionListenerTest extends TestCase {
     }
 
     assertNotNull(events);
-    assertEquals(events.length, 1);
+    assertEquals(1, events.length);
     assertEquals(handle, events[0].listener);
     assertTrue(events[0].connected);
 
@@ -95,16 +104,15 @@ public class ConnectionListenerTest extends TestCase {
     }
 
     assertNotNull(events);
-    assertEquals(events.length, 1);
+    assertEquals(1, events.length);
     assertEquals(handle, events[0].listener);
     assertFalse(events[0].connected);
 
   }
 
-  /**
-   * Test threaded behavior.
-   */
-  public void testThreaded() {
+  @Test
+  @DisabledOnOs(OS.WINDOWS)
+  void testThreaded() {
     m_serverInst.startServer("connectionlistenertest.ini", "127.0.0.1", 10000);
     List<ConnectionNotification> events = new ArrayList<>();
     final int handle = m_serverInst.addConnectionListener(events::add, false);
@@ -124,7 +132,7 @@ public class ConnectionListenerTest extends TestCase {
     assertTrue(m_serverInst.waitForConnectionListenerQueue(1.0));
 
     // get the event
-    assertEquals(events.size(), 1);
+    assertEquals(1, events.size());
     assertEquals(handle, events.get(0).listener);
     assertTrue(events.get(0).connected);
     events.clear();
@@ -139,7 +147,7 @@ public class ConnectionListenerTest extends TestCase {
 
     // get the event
     assertTrue(m_serverInst.waitForConnectionListenerQueue(1.0));
-    assertEquals(events.size(), 1);
+    assertEquals(1, events.size());
     assertEquals(handle, events.get(0).listener);
     assertFalse(events.get(0).connected);
   }
diff --git a/shared/java/javacommon.gradle b/shared/java/javacommon.gradle
index f354ce62ed..1140edf806 100644
--- a/shared/java/javacommon.gradle
+++ b/shared/java/javacommon.gradle
@@ -87,6 +87,7 @@ publishing {
 }
 
 test {
+    useJUnitPlatform()
     testLogging {
         events "failed"
         exceptionFormat "full"
@@ -123,7 +124,11 @@ compileJava {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
+    testCompileOnly 'junit:junit:4.12'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.2.0'
+
     devCompile sourceSets.main.output
 }