diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index cf11ef9e7a..ba795480be 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -23,4 +23,7 @@ if (BUILD_TOOLS)
 
   add_subdirectory(oven)
   set_target_properties(oven PROPERTIES FOLDER "Tools")
+
+  add_subdirectory(auto-tester)
+  set_target_properties(auto-tester PROPERTIES FOLDER "Tools")
 endif()
diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
new file mode 100644
index 0000000000..b081c8b9f1
--- /dev/null
+++ b/tools/auto-tester/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.9)
+
+project (auto-tester)
+
+add_executable(auto-tester src/main.cpp)
\ No newline at end of file
diff --git a/tools/auto-tester/src/autoTester.h b/tools/auto-tester/src/autoTester.h
new file mode 100644
index 0000000000..9c1ebfd53c
--- /dev/null
+++ b/tools/auto-tester/src/autoTester.h
@@ -0,0 +1,37 @@
+//
+//  AutoTester.h
+//  zone/ambientLightInheritence
+//
+//  Created by Nissim Hadar on 2 Nov 2017.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AutoTester_h
+#define hifi_AutoTester_h
+
+////#include <QtWidgets/QMainWindow>
+////#include "ui_autoTester.h"
+////#include "Test.h"
+////
+////class AutoTester : public QMainWindow
+////{
+////    Q_OBJECT
+////
+////public:
+////    AutoTester(QWidget *parent = Q_NULLPTR);
+////
+////private slots:
+////    void on_evaluateTestsButton_clicked();
+////    void on_createTestButton_clicked();
+////    void on_closeButton_clicked();
+////
+////private:
+////    Ui::AutoTesterClass ui;
+////
+////    Test test;
+////};
+
+#endif // hifi_AutoTester_h
\ No newline at end of file
diff --git a/tools/auto-tester/src/main.cpp b/tools/auto-tester/src/main.cpp
new file mode 100644
index 0000000000..9bc9892835
--- /dev/null
+++ b/tools/auto-tester/src/main.cpp
@@ -0,0 +1,21 @@
+//
+//  Test.cpp
+//
+//  Created by Nissim Hadar on 2 Nov 2017.
+//  Copyright 2013 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include <QtWidgets/QApplication>
+#include "autoTester.h"
+
+int main(int argc, char *argv[])
+{
+////    QApplication application(argc, argv);
+
+////    AutoTester autoTester;
+////    autoTester.show();
+
+////    return application.exec();
+}