diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65af1a93..22808017 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,21 +129,21 @@ endforeach()
 add_test(
     NAME "compression-prs"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh prs ${CMAKE_BINARY_DIR}/newserv)
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test-compression.sh prs ${CMAKE_BINARY_DIR}/newserv)
 add_test(
     NAME "compression-bc0"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${CMAKE_SOURCE_DIR}/test-compression.sh bc0 ${CMAKE_BINARY_DIR}/newserv)
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test-compression.sh bc0 ${CMAKE_BINARY_DIR}/newserv)
 
 add_test(
     NAME "decode-vms"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${CMAKE_SOURCE_DIR}/test-decode-vms.sh ${CMAKE_BINARY_DIR}/newserv)
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test-decode-vms.sh ${CMAKE_BINARY_DIR}/newserv)
 
 add_test(
     NAME "decode-gci"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${CMAKE_SOURCE_DIR}/test-decode-gci.sh ${CMAKE_BINARY_DIR}/newserv)
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test-decode-gci.sh ${CMAKE_BINARY_DIR}/newserv)
 
 # Installation configuration
 
diff --git a/test-compression.sh b/tests/test-compression.sh
similarity index 100%
rename from test-compression.sh
rename to tests/test-compression.sh
diff --git a/test-decode-gci.sh b/tests/test-decode-gci.sh
similarity index 100%
rename from test-decode-gci.sh
rename to tests/test-decode-gci.sh
diff --git a/test-decode-vms.sh b/tests/test-decode-vms.sh
similarity index 100%
rename from test-decode-vms.sh
rename to tests/test-decode-vms.sh