diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index fcdeafe194..5e0619b253 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -1,31 +1,39 @@
 set(TARGET_NAME auto-tester)
 project(${TARGET_NAME})
 
+# Automatically run UIC and MOC.  This replaces the older WRAP macros
+SET(CMAKE_AUTOUIC ON) 
+SET(CMAKE_AUTOMOC ON) 
+
 setup_hifi_project(Widgets)
 link_hifi_libraries()
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-
 set_property(TARGET auto-tester PROPERTY WIN32_EXECUTABLE true)
 
-set(SOURCES src/main.cpp src/Test.cpp src/ui/AutoTester.cpp src/ui/MismatchWindow.cpp)
-set(MOC_HEADERS src/ui/AutoTester.h src/ui/MismatchWindow.h)
-set(UIS ui/AutoTester.ui ui/MismatchWindow.ui)
-set(RESOURCES src/AutoTester.qrc)
-
-QT5_ADD_RESOURCES(RES_SOURCES ${RESOURCES})
-QT5_WRAP_UI(UI_HEADERS ${UIS})
-QT5_WRAP_CPP(MOC_SRCS ${MOC_HEADERS})
-
-add_executable(PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS})
+# This is preferred to GLOB_RECURSE, as per CMake documentation
+set(SOURCES src/main.cpp src/Test.cpp src/ui/autoTester.cpp src/ui/mismatchWindow.cpp)
+set(MOC_HEADERS src/autoTester.h src/mismatchWindow.h)
+set(UIS src/ui/autoTester.ui src/ui/mismatchWindow.ui)
 
+if (WIN32)
+  add_executable(PROJECT_NAME WIN32 ${SOURCES} ${MOC_SRCS} ${UI_HEADERS})
+else()
+  add_executable(PROJECT_NAME ${SOURCES} ${MOC_SRCS} ${RES_SOURCES} ${UI_HEADERS})
+endif()
+ 
 target_link_libraries(PROJECT_NAME ${QT_LIBRARIES})
 
+# Copy required dll's.
+# Note that the two ImageMagick files are copied twice.  This is to allow the tester to run from VS as well as 
+# directly from the executable.
 add_custom_command(
     TARGET auto-tester
     POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Core> $<TARGET_FILE_DIR:auto-tester>
     COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Gui> $<TARGET_FILE_DIR:auto-tester>
     COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:Qt5::Widgets> $<TARGET_FILE_DIR:auto-tester>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ImageMagick/magick.exe $<TARGET_FILE_DIR:auto-tester>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ImageMagick/magic.xml $<TARGET_FILE_DIR:auto-tester>
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ImageMagick/magick.exe $<TARGET_FILE_DIR:auto-tester>/..
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ImageMagick/magic.xml $<TARGET_FILE_DIR:auto-tester>/..
 )
\ No newline at end of file
diff --git a/tools/auto-tester/ImageMagick/magic.xml b/tools/auto-tester/ImageMagick/magic.xml
new file mode 100644
index 0000000000..7f17731b09
--- /dev/null
+++ b/tools/auto-tester/ImageMagick/magic.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE magicmap [
+<!ELEMENT magicmap (magic)+>
+<!ELEMENT magic (#PCDATA)>
+<!ATTLIST magic name CDATA #REQUIRED>
+<!ATTLIST magic offset CDATA "0">
+<!ATTLIST magic target CDATA #REQUIRED>
+]>
+<!--
+  Associate an image format with a unique identifier. 
+
+  Many image formats have identifiers that uniquely identify a particular
+  image format. For example, the GIF image format always begins with GIF8
+  as the first 4 characters of the image. ImageMagick uses this information
+  to quickly determine the type of image it is dealing with when it reads
+  an image.
+-->
+<magicmap>
+  <!-- <magic name="GIF" offset="0" target="GIF8"/> -->
+  <!-- <magic name="JPEG" offset="0" target="\377\330\377"/> -->
+  <!-- <magic name="PNG" offset="0" target="\211PNG\r\n\032\n"/> -->
+  <!-- <magic name="TIFF" offset="0" target="\115\115\000\052"/> -->
+</magicmap>
diff --git a/tools/auto-tester/ImageMagick/magick.exe b/tools/auto-tester/ImageMagick/magick.exe
new file mode 100644
index 0000000000..f77e451dad
Binary files /dev/null and b/tools/auto-tester/ImageMagick/magick.exe differ
diff --git a/tools/auto-tester/src/AutoTester.qrc b/tools/auto-tester/src/AutoTester.qrc
deleted file mode 100644
index ac16b9dd31..0000000000
--- a/tools/auto-tester/src/AutoTester.qrc
+++ /dev/null
@@ -1,4 +0,0 @@
-<RCC>
-    <qresource prefix="AutoTester">
-    </qresource>
-</RCC>
diff --git a/tools/auto-tester/ui/AutoTester.ui b/tools/auto-tester/src/ui/AutoTester.ui
similarity index 100%
rename from tools/auto-tester/ui/AutoTester.ui
rename to tools/auto-tester/src/ui/AutoTester.ui
diff --git a/tools/auto-tester/ui/MismatchWindow.ui b/tools/auto-tester/src/ui/MismatchWindow.ui
similarity index 100%
rename from tools/auto-tester/ui/MismatchWindow.ui
rename to tools/auto-tester/src/ui/MismatchWindow.ui