diff --git a/tools/nitpick/src/TestRunner.h b/tools/nitpick/src/TestRunner.h
index a852aafaa7..338cb5524e 100644
--- a/tools/nitpick/src/TestRunner.h
+++ b/tools/nitpick/src/TestRunner.h
@@ -12,12 +12,31 @@
 #define hifi_testRunner_h
 
 #include <QLabel>
+#include <QObject>
+
+class Worker;
 
 class TestRunner {
 public:
     void setWorkingFolder(QLabel* workingFolderLabel);
 
-private:
+protected:
     QString _workingFolder;
 };
+
+class Worker : public QObject {
+    Q_OBJECT
+public:
+    void setCommandLine(const QString& commandLine);
+
+public slots:
+    int runCommand();
+
+signals:
+    void commandComplete();
+
+private:
+    QString _commandLine;
+};
+
 #endif
diff --git a/tools/nitpick/src/TestRunnerDesktop.cpp b/tools/nitpick/src/TestRunnerDesktop.cpp
index 67a7932fde..f8e69650e0 100644
--- a/tools/nitpick/src/TestRunnerDesktop.cpp
+++ b/tools/nitpick/src/TestRunnerDesktop.cpp
@@ -41,7 +41,7 @@ TestRunnerDesktop::TestRunnerDesktop(std::vector<QCheckBox*> dayCheckboxes,
     _runNow = runNow;
 
     _installerThread = new QThread();
-    _installerWorker = new Worker();
+    _installerWorker = new InstallerWorker();
         
     _installerWorker->moveToThread(_installerThread);
     _installerThread->start();
@@ -49,7 +49,7 @@ TestRunnerDesktop::TestRunnerDesktop(std::vector<QCheckBox*> dayCheckboxes,
     connect(_installerWorker, SIGNAL(commandComplete()), this, SLOT(installationComplete()));
 
     _interfaceThread = new QThread();
-    _interfaceWorker = new Worker();
+    _interfaceWorker = new InterfaceWorker();
 
     _interfaceThread->start();
     _interfaceWorker->moveToThread(_interfaceThread);
diff --git a/tools/nitpick/src/TestRunnerDesktop.h b/tools/nitpick/src/TestRunnerDesktop.h
index 5e11c79944..1cc93c3ad5 100644
--- a/tools/nitpick/src/TestRunnerDesktop.h
+++ b/tools/nitpick/src/TestRunnerDesktop.h
@@ -29,7 +29,8 @@ public:
     QString url;
 };
 
-class Worker;
+class InterfaceWorker;
+class InstallerWorker;
 
 class TestRunnerDesktop : public QObject, public TestRunner {
     Q_OBJECT
@@ -109,7 +110,6 @@ private:
     QDir _appDataFolder;
     QDir _savedAppDataFolder;
 
-    QString _workingFolder;
     QString _installationFolder;
     QString _snapshotFolder;
 
@@ -136,26 +136,21 @@ private:
     QThread* _installerThread;
     QThread* _interfaceThread;
 
-    Worker* _installerWorker;
-    Worker* _interfaceWorker;
-    
+    InstallerWorker* _installerWorker;
+    InterfaceWorker* _interfaceWorker;
+
     BuildInformation _buildInformation;
 };
 
-class Worker : public QObject {
+class InstallerWorker : public Worker {
     Q_OBJECT
-public:
-    void setCommandLine(const QString& commandLine);
-
-public slots:
-    int runCommand();
-
 signals:
-    void commandComplete();
     void startInstaller();
+};
+
+class InterfaceWorker : public Worker {
+    Q_OBJECT
+signals:
     void startInterface();
-    
-private:
-    QString _commandLine;
 };
 #endif
diff --git a/tools/nitpick/src/TestRunnerMobile.cpp b/tools/nitpick/src/TestRunnerMobile.cpp
index 66e7ab1c05..384314903d 100644
--- a/tools/nitpick/src/TestRunnerMobile.cpp
+++ b/tools/nitpick/src/TestRunnerMobile.cpp
@@ -31,4 +31,5 @@ void TestRunnerMobile::setWorkingFolderAndEnableControls() {
 }
 
 void TestRunnerMobile::readDevice() {
+
 }