diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc
index 302950339..65b6375c4 100644
--- a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc
+++ b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc
@@ -104,24 +104,6 @@ bool rs_nxs_test::NxsTestHub::testsPassed()
 	return mTestScenario->checkTestPassed();
 }
 
-
-void rs_nxs_test::NxsTestHub::runloop()
-{
-	double timeDelta = .2;
-    while(!shouldStop())
-	{
-#ifndef WINDOWS_SYS
-        usleep((int) (timeDelta * 1000000));
-#else
-        Sleep((int) (timeDelta * 1000));
-#endif
-
-        tick();
-	}
-
-}
-
-
 void rs_nxs_test::NxsTestHub::StartTest()
 {
 	// get all services up and running
@@ -138,7 +120,7 @@ void rs_nxs_test::NxsTestHub::StartTest()
 void rs_nxs_test::NxsTestHub::EndTest()
 {
 	// then stop this thread
-    ask_for_stop();
+    join();
 
 	// stop services
 	PeerNxsMap::iterator mit = mPeerNxsMap.begin();
@@ -217,7 +199,7 @@ void rs_nxs_test::NxsTestHub::CleanUpTest()
 	mTestScenario->cleanTestScenario();
 }
 
-void rs_nxs_test::NxsTestHub::tick()
+void rs_nxs_test::NxsTestHub::data_tick()
 {
 	// for each nxs instance pull out all items from each and then move to destination peer
 
@@ -248,6 +230,8 @@ void rs_nxs_test::NxsTestHub::tick()
 
 	}
 
+    double timeDelta = .2;
+    usleep(timeDelta * 1000000);
 }
 
 
diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h
index 437accc42..f5eeac5f0 100644
--- a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h
+++ b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h
@@ -35,7 +35,7 @@ namespace rs_nxs_test
 	 * and synchronise according to their subscriptions. The default is to subscribe to all groups held by other peer
 	 * The threads for both net instances are started which begins their processing of transactions
 	 */
-	class NxsTestHub : public RsThread, public RecvPeerItemIface
+    class NxsTestHub : public RsTickingThread, public RecvPeerItemIface
 	{
 	public:
 
@@ -58,12 +58,6 @@ namespace rs_nxs_test
 		 */
 		bool testsPassed();
 
-		/*!
-		 *  This simulates the p3Service ticker and calls both gxs net services tick methods
-		 *  Also enables transport of messages between both services
-		 */
-        void runloop();
-
 		/*!
 		 * Begings test, equivalent to CreateThread(this)
 		 */
@@ -97,7 +91,11 @@ namespace rs_nxs_test
 
 	private:
 
-	    void tick();
+        /*!
+         *  This simulates the p3Service ticker and calls both gxs net services tick methods
+         *  Also enables transport of messages between both services
+         */
+        virtual void data_tick();
 
 	private: