diff --git a/Code/tests/DNP3Port_tests/TestDNP3PortLinkFailure.cpp b/Code/tests/DNP3Port_tests/TestDNP3PortLinkFailure.cpp
index 5ea326d9..f745decd 100644
--- a/Code/tests/DNP3Port_tests/TestDNP3PortLinkFailure.cpp
+++ b/Code/tests/DNP3Port_tests/TestDNP3PortLinkFailure.cpp
@@ -432,6 +432,9 @@ TEST_CASE(SUITE("Single Drop"))
 			auto new_open1 = require_connection_increase(pMITM,true,start_open1);
 			auto new_open2 = require_connection_increase(pMITM,false,start_open2);
 			odc::spdlog_get("DNP3Port")->info("New connection count: {},{}",new_open1,new_open2);
+
+			port_pair.first->Disable();
+			port_pair.second->Disable();
 		}
 
 		work.reset();
diff --git a/Code/tests/FileTransferPort_tests/EndToEnd.cpp b/Code/tests/FileTransferPort_tests/EndToEnd.cpp
index e6022daa..f188a803 100644
--- a/Code/tests/FileTransferPort_tests/EndToEnd.cpp
+++ b/Code/tests/FileTransferPort_tests/EndToEnd.cpp
@@ -207,6 +207,7 @@ TEST_CASE(SUITE("CorruptConnector"))
 		//turn them off
 		RX->Disable();
 		TX->Disable();
+		nasty.Disable();
 	}
 	//Unload the library
 	UnLoadModule(portlib);
diff --git a/Code/tests/ODC_tests/EventInfoTests.cpp b/Code/tests/ODC_tests/EventInfoTests.cpp
index ad1903ef..6f1cf33b 100644
--- a/Code/tests/ODC_tests/EventInfoTests.cpp
+++ b/Code/tests/ODC_tests/EventInfoTests.cpp
@@ -136,6 +136,9 @@ TEST_CASE(SUITE("PayloadTransport"))
 		ios->poll_one();
 
 	watchdog->cancel();
+	Source.Disable();
+	Sink.Disable();
+	Conn.Disable();
 	work.reset();
 	ios->run();