diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp
index 1cd98c336..6bd7cbc61 100644
--- a/plugins/samplesource/testsource/testsourceinput.cpp
+++ b/plugins/samplesource/testsource/testsourceinput.cpp
@@ -22,6 +22,7 @@
 #include <QNetworkReply>
 #include <QNetworkAccessManager>
 #include <QBuffer>
+#include <QThread>
 
 #include "SWGDeviceSettings.h"
 #include "SWGDeviceState.h"
@@ -40,6 +41,7 @@ TestSourceInput::TestSourceInput(DeviceAPI *deviceAPI) :
     m_deviceAPI(deviceAPI),
 	m_settings(),
 	m_testSourceWorker(nullptr),
+    m_testSourceWorkerThread(nullptr),
 	m_deviceDescription("TestSourceInput"),
 	m_running(false),
 	m_masterTimer(deviceAPI->getMasterTimer())
@@ -86,7 +88,7 @@ bool TestSourceInput::start()
 	QMutexLocker mutexLocker(&m_mutex);
 
     if (m_running) {
-        stop();
+        return true;
     }
 
     if (!m_sampleFifo.setSize(96000 * 4))
@@ -95,11 +97,16 @@ bool TestSourceInput::start()
         return false;
     }
 
+    m_testSourceWorkerThread = new QThread();
     m_testSourceWorker = new TestSourceWorker(&m_sampleFifo);
-    m_testSourceWorker->moveToThread(&m_testSourceWorkerThread);
+    m_testSourceWorker->moveToThread(m_testSourceWorkerThread);
+
+    QObject::connect(m_testSourceWorkerThread, &QThread::started, m_testSourceWorker, &TestSourceWorker::startWork);
+    QObject::connect(m_testSourceWorkerThread, &QThread::finished, m_testSourceWorker, &QObject::deleteLater);
+    QObject::connect(m_testSourceWorkerThread, &QThread::finished, m_testSourceWorkerThread, &QThread::deleteLater);
+
 	m_testSourceWorker->setSamplerate(m_settings.m_sampleRate);
-    m_testSourceWorker->startWork();
-    m_testSourceWorkerThread.start();
+    m_testSourceWorkerThread->start();
 	m_running = true;
 
 	mutexLocker.unlock();
@@ -114,13 +121,13 @@ void TestSourceInput::stop()
 	QMutexLocker mutexLocker(&m_mutex);
     m_running = false;
 
-    if (m_testSourceWorker)
+    if (m_testSourceWorkerThread)
     {
     	m_testSourceWorker->stopWork();
-        m_testSourceWorkerThread.quit();
-        m_testSourceWorkerThread.wait();
-        delete m_testSourceWorker;
+        m_testSourceWorkerThread->quit();
+        m_testSourceWorkerThread->wait();
         m_testSourceWorker = nullptr;
+        m_testSourceWorkerThread = nullptr;
     }
 }
 
diff --git a/plugins/samplesource/testsource/testsourceinput.h b/plugins/samplesource/testsource/testsourceinput.h
index 1dbed6ddc..ad5c75bed 100644
--- a/plugins/samplesource/testsource/testsourceinput.h
+++ b/plugins/samplesource/testsource/testsourceinput.h
@@ -22,7 +22,6 @@
 #include <QByteArray>
 #include <QTimer>
 #include <QNetworkRequest>
-#include <QThread>
 
 #include <dsp/devicesamplesource.h>
 #include "testsourcesettings.h"
@@ -31,6 +30,7 @@ class DeviceAPI;
 class TestSourceWorker;
 class QNetworkAccessManager;
 class QNetworkReply;
+class QThread;
 
 class TestSourceInput : public DeviceSampleSource {
     Q_OBJECT
@@ -129,8 +129,8 @@ private:
 	DeviceAPI *m_deviceAPI;
 	QMutex m_mutex;
 	TestSourceSettings m_settings;
-	TestSourceWorker* m_testSourceWorker;
-    QThread m_testSourceWorkerThread;
+	TestSourceWorker *m_testSourceWorker;
+    QThread *m_testSourceWorkerThread;
 	QString m_deviceDescription;
 	bool m_running;
     const QTimer& m_masterTimer;