diff --git a/.gitignore b/.gitignore
index 2e899152..2de37aca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@ docs/doxyxml/
 #*#
 *~
 .DS_Store
-tests/test_data/writer/*.xlsx
-tests/runner-autogen.cpp
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
index 94c4157f..eb5fb6dd 100644
--- a/build/cmake/CMakeLists.txt
+++ b/build/cmake/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2.2)
+cmake_minimum_required(VERSION 2.8.7)
 
 project(xlnt)
 
diff --git a/build/cmake/xlnt.test/CMakeLists.txt b/build/cmake/xlnt.test/CMakeLists.txt
index cbb4c431..419bf801 100644
--- a/build/cmake/xlnt.test/CMakeLists.txt
+++ b/build/cmake/xlnt.test/CMakeLists.txt
@@ -1,7 +1,16 @@
-cmake_minimum_required(VERSION 3.2.2)
 project(xlnt.test)
+
 include_directories(../../../include)
 include_directories(../../../third-party/pugixml/src)
 include_directories(../../../third-party/cxxtest)
+
 add_executable(xlnt.test ../../../tests/runner-autogen.cpp)
+
 target_link_libraries(xlnt.test xlnt)
+
+add_custom_target (generate 
+    COMMAND ../generate-tests.sh
+    COMMENT "Generating test runner tests/runner-autogen.cpp"
+)
+
+add_dependencies(xlnt.test generate)
diff --git a/build/cmake/xlnt/CMakeLists.txt b/build/cmake/xlnt/CMakeLists.txt
index e331164a..5284a473 100644
--- a/build/cmake/xlnt/CMakeLists.txt
+++ b/build/cmake/xlnt/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.2.2)
 project(xlnt)
 
 include_directories(../../../include)
diff --git a/build/generate-tests.sh b/build/generate-tests.sh
new file mode 100755
index 00000000..f4478033
--- /dev/null
+++ b/build/generate-tests.sh
@@ -0,0 +1,3 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $DIR
+../third-party/cxxtest/bin/cxxtestgen --runner=ErrorPrinter -o ../tests/runner-autogen.cpp ../tests/*.hpp
\ No newline at end of file
diff --git a/build/genie/genie.lua b/build/genie/genie.lua
index d68eaac7..49c69b09 100644
--- a/build/genie/genie.lua
+++ b/build/genie/genie.lua
@@ -21,7 +21,7 @@ project "xlnt.test"
        "../../tests/runner-autogen.cpp"
     }
     links { "xlnt", "miniz" }
-    prebuildcommands { "../../../third-party/cxxtest/bin/cxxtestgen --runner=ErrorPrinter -o ../../../tests/runner-autogen.cpp ../../../tests/*.hpp" }
+    prebuildcommands { "../generate-tests.sh" }
     flags { "Unicode" }
     configuration "windows"
         defines { "WIN32" }
diff --git a/tests/runner-autogen.cpp b/tests/runner-autogen.cpp
new file mode 100644
index 00000000..68b4678e
--- /dev/null
+++ b/tests/runner-autogen.cpp
@@ -0,0 +1 @@
+#error This file should be generated from tests before compiling