diff --git a/test/dorkboxTest/network/BaseTest.kt b/test/dorkboxTest/network/BaseTest.kt
index 7660ee8d..622830f1 100644
--- a/test/dorkboxTest/network/BaseTest.kt
+++ b/test/dorkboxTest/network/BaseTest.kt
@@ -279,6 +279,7 @@ abstract class BaseTest {
             }
         } catch (e: Exception) {
             e.printStackTrace()
+            stopEndPoints()
             false
         }
 
diff --git a/test/dorkboxTest/network/PingTest.kt b/test/dorkboxTest/network/PingTest.kt
index dd2a2133..8d49203f 100644
--- a/test/dorkboxTest/network/PingTest.kt
+++ b/test/dorkboxTest/network/PingTest.kt
@@ -66,7 +66,7 @@ class PingTest : BaseTest() {
             client.connect(LOCALHOST)
         }
 
-        waitForThreads(500)
+        waitForThreads(1500)
 
         Assert.assertTrue(clientSuccess.value)
     }