diff --git a/CMakeLists.txt b/CMakeLists.txt
index 800f74e37..db4149630 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,6 +503,7 @@ if(BUILD_TESTS)
     endif()
     install(DIRECTORY ${dfhack_SOURCE_DIR}/test
         DESTINATION ${DFHACK_DATA_DESTINATION}/scripts)
+    install(FILES ci/test.lua DESTINATION ${DFHACK_DATA_DESTINATION}/scripts)
 endif()
 
 # Packaging with CPack!
diff --git a/test/main.lua b/ci/test.lua
similarity index 100%
rename from test/main.lua
rename to ci/test.lua
diff --git a/docs/changelog.txt b/docs/changelog.txt
index ee509e9df..fa862eecd 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -38,6 +38,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Internals
 - The DFHack test harness is now much easier to use for iterative development.  Configuration can now be specified on the commandline, there are more test filter options, and the test harness can now easily rerun tests that have been run before.
+- The ``test/main`` command to invoke the test harness has been renamed to just ``test``
 
 # 0.47.05-r1
 
diff --git a/test/test_test.lua b/test/test.lua
similarity index 100%
rename from test/test_test.lua
rename to test/test.lua