diff --git a/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/stream/SocketTest.java b/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/stream/SocketTest.java
index 36cf2724f4..fb02086a72 100644
--- a/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/stream/SocketTest.java
+++ b/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/stream/SocketTest.java
@@ -19,9 +19,9 @@ public class SocketTest {
 	}};
 
 
-	@Test(timeout=1000)
+	@Test(timeout=1500)
 	public void testSingleSocketConnection() throws Throwable {
-		doSocketTest(1, 500, 1000, SocketStreams.newStreamProvider(10111), SocketStreams.newStreamFactory("localhost", 10111));
+		doSocketTest(1, 500, 1500, SocketStreams.newStreamProvider(10111), SocketStreams.newStreamFactory("localhost", 10111));
 	}
 	@Test(timeout=2500)
 	public void testManySocketConnection() throws Throwable {
diff --git a/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/thread/DefaultThreadManagerTest.java b/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/thread/DefaultThreadManagerTest.java
index 8a78f178c5..0bc3a491ea 100644
--- a/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/thread/DefaultThreadManagerTest.java
+++ b/networktables/java/src/test/java/edu/wpi/first/wpilibj/networktables2/thread/DefaultThreadManagerTest.java
@@ -10,7 +10,7 @@ import org.junit.*;
 
 public class DefaultThreadManagerTest {
 	volatile Throwable exception = null;
-	@Test(timeout=300)
+	@Test(timeout=400)
 	public void testConcurrentThreads() throws Throwable {
 		final int numCounts = 10;
 		final int numThreads = 10;