diff --git a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/P2PRpcTest.scala b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/P2PRpcTest.scala
index 5864eb4632..19734d7e25 100644
--- a/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/P2PRpcTest.scala
+++ b/bitcoind-rpc-test/src/test/scala/org/bitcoins/rpc/common/P2PRpcTest.scala
@@ -170,7 +170,7 @@ class P2PRpcTest extends BitcoindRpcTest {
   it should "be able to get the connection count" in {
     for {
       (freshClient, otherFreshClient) <- BitcoindRpcTestUtil
-        .createUnconnectedNodePair()
+        .createUnconnectedNodePair(clientAccum = clientAccum)
       connectionPre <- freshClient.getConnectionCount
       _ <- freshClient.addNode(otherFreshClient.getDaemon.uri,
                                AddNodeArgument.Add)
diff --git a/node-test/src/test/scala/org/bitcoins/node/networking/ClientTest.scala b/node-test/src/test/scala/org/bitcoins/node/networking/ClientTest.scala
index 8ee9189a28..f827e3ec26 100644
--- a/node-test/src/test/scala/org/bitcoins/node/networking/ClientTest.scala
+++ b/node-test/src/test/scala/org/bitcoins/node/networking/ClientTest.scala
@@ -13,9 +13,10 @@ import org.bitcoins.testkit.node.NodeTestUtil
 import org.bitcoins.testkit.rpc.BitcoindRpcTestUtil
 import org.scalatest._
 
-import scala.concurrent.Future
-import scala.concurrent.duration.DurationInt
+import scala.concurrent.{Await, Future}
+import scala.concurrent.duration.{Duration, DurationInt}
 import org.bitcoins.testkit.BitcoinSAppConfig
+import org.bitcoins.testkit.chain.ChainUnitTest
 
 /**
   * Created by chris on 6/7/16.
@@ -100,8 +101,9 @@ class ClientTest
   }
 
   override def afterAll: Unit = {
-    bitcoindRpcF.flatMap(_.stop())
-    bitcoindRpc2F.flatMap(_.stop())
+    implicit val ec = system.dispatcher
+    Await.ready(bitcoindRpcF.flatMap(ChainUnitTest.destroyBitcoind(_)(system)), 10.seconds)
+    Await.ready(bitcoindRpc2F.flatMap(ChainUnitTest.destroyBitcoind(_)(system)), 10.seconds)
     TestKit.shutdownActorSystem(system)
   }