diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b9ae635a4f..6cda67db2d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -20,7 +20,7 @@ endfunction()
 
 if (BUILD_TOOLS)
     # Allow different tools for stable builds
-    if (STABLE_BUILD)
+    if (RELEASE_TYPE STREQUAL "PRODUCTION")
         set(ALL_TOOLS 
             udt-test 
             vhacd-util
diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index d5bc6f6e5a..39800c6bc6 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -40,7 +40,11 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
  
     _ui.plainTextEdit->setReadOnly(true);
 
-   setWindowTitle("Nitpick - v2.1.2");
+    setWindowTitle("Nitpick - v3.0.0");
+
+    clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone";
+    _ui.clientProfileComboBox->insertItems(0, clientProfiles);
+
 }
 
 Nitpick::~Nitpick() {
@@ -157,7 +161,7 @@ void Nitpick::on_createAllRecursiveScriptsPushbutton_clicked() {
 }
 
 void Nitpick::on_createTestsPushbutton_clicked() {
-    _test->createTests();
+    _test->createTests(_ui.clientProfileComboBox->currentText());
 }
 
 void Nitpick::on_createMDFilePushbutton_clicked() {
diff --git a/tools/nitpick/src/Nitpick.h b/tools/nitpick/src/Nitpick.h
index 36ec7e534b..80fef934d6 100644
--- a/tools/nitpick/src/Nitpick.h
+++ b/tools/nitpick/src/Nitpick.h
@@ -126,6 +126,8 @@ private:
     bool _isRunningFromCommandline{ false };
 
     void* _caller;
+
+    QStringList clientProfiles;
 };
 
 #endif  // hifi_Nitpick_h
\ No newline at end of file
diff --git a/tools/nitpick/src/Test.cpp b/tools/nitpick/src/Test.cpp
index f1e950db88..e8e284bf32 100644
--- a/tools/nitpick/src/Test.cpp
+++ b/tools/nitpick/src/Test.cpp
@@ -391,7 +391,7 @@ void Test::includeTest(QTextStream& textStream, const QString& testPathname) {
     textStream << "Script.include(testsRootPath + \"" << partialPathWithoutTests + "\");" << endl;
 }
 
-void Test::createTests() {
+void Test::createTests(const QString& clientProfile) {
     // Rename files sequentially, as ExpectedResult_00000.png, ExpectedResult_00001.png and so on
     // Any existing expected result images will be deleted
     QString previousSelection = _snapshotDirectory;
diff --git a/tools/nitpick/src/Test.h b/tools/nitpick/src/Test.h
index 166c71688d..23011d0c31 100644
--- a/tools/nitpick/src/Test.h
+++ b/tools/nitpick/src/Test.h
@@ -52,7 +52,7 @@ public:
 
     void finishTestsEvaluation();
 
-    void createTests();
+    void createTests(const QString& clientProfile);
 
     void createTestsOutline();
 
diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui
index 79bdfd158b..47471522db 100644
--- a/tools/nitpick/ui/Nitpick.ui
+++ b/tools/nitpick/ui/Nitpick.ui
@@ -52,8 +52,8 @@
      <widget class="QPushButton" name="createTestsPushbutton">
       <property name="geometry">
        <rect>
-        <x>210</x>
-        <y>60</y>
+        <x>70</x>
+        <y>40</y>
         <width>220</width>
         <height>40</height>
        </rect>
@@ -153,6 +153,16 @@
        <string>Create all testAuto scripts</string>
       </property>
      </widget>
+     <widget class="QComboBox" name="clientProfileComboBox">
+      <property name="geometry">
+       <rect>
+        <x>320</x>
+        <y>40</y>
+        <width>120</width>
+        <height>40</height>
+       </rect>
+      </property>
+     </widget>
     </widget>
     <widget class="QWidget" name="tab_4">
      <attribute name="title">