diff --git a/modules/ecs/auto-test/README.md b/modules/ecs/tests/unit-tests/README.md
similarity index 100%
rename from modules/ecs/auto-test/README.md
rename to modules/ecs/tests/unit-tests/README.md
diff --git a/modules/ecs/auto-test/inc-c/voxula/tests/ecs.h b/modules/ecs/tests/unit-tests/inc-c/voxula/tests/ecs.h
similarity index 100%
rename from modules/ecs/auto-test/inc-c/voxula/tests/ecs.h
rename to modules/ecs/tests/unit-tests/inc-c/voxula/tests/ecs.h
diff --git a/modules/ecs/auto-test/src-c/cases/many-entities.c b/modules/ecs/tests/unit-tests/src-c/cases/many-entities.c
similarity index 100%
rename from modules/ecs/auto-test/src-c/cases/many-entities.c
rename to modules/ecs/tests/unit-tests/src-c/cases/many-entities.c
diff --git a/modules/ecs/auto-test/src-c/main.c b/modules/ecs/tests/unit-tests/src-c/main.c
similarity index 100%
rename from modules/ecs/auto-test/src-c/main.c
rename to modules/ecs/tests/unit-tests/src-c/main.c
diff --git a/modules/utility/auto-test/README.md b/modules/utility/tests/unit-tests/README.md
similarity index 100%
rename from modules/utility/auto-test/README.md
rename to modules/utility/tests/unit-tests/README.md
diff --git a/modules/utility/auto-test/inc-c/voxula/tests/utility.h b/modules/utility/tests/unit-tests/inc-c/voxula/tests/utility.h
similarity index 100%
rename from modules/utility/auto-test/inc-c/voxula/tests/utility.h
rename to modules/utility/tests/unit-tests/inc-c/voxula/tests/utility.h
diff --git a/modules/utility/auto-test/src-c/interaction/pool.c b/modules/utility/tests/unit-tests/src-c/interaction/pool.c
similarity index 100%
rename from modules/utility/auto-test/src-c/interaction/pool.c
rename to modules/utility/tests/unit-tests/src-c/interaction/pool.c
diff --git a/modules/utility/auto-test/src-c/main.c b/modules/utility/tests/unit-tests/src-c/main.c
similarity index 100%
rename from modules/utility/auto-test/src-c/main.c
rename to modules/utility/tests/unit-tests/src-c/main.c
diff --git a/scripts/auto-test.bash b/scripts/run-unit-tests.bash
similarity index 82%
rename from scripts/auto-test.bash
rename to scripts/run-unit-tests.bash
index 80719ec..cc0315d 100644
--- a/scripts/auto-test.bash
+++ b/scripts/run-unit-tests.bash
@@ -11,7 +11,7 @@ function list_modules() {
     MODULES=$(ls $MODULE_FOLDER)
     for MODULE in $MODULES
     do
-        if [[ -d "$MODULE_FOLDER/$MODULE/auto-test" ]];
+        if [[ -d "$MODULE_FOLDER/$MODULE/tests/unit-tests" ]];
         then
             echo $MODULE
         fi
@@ -45,12 +45,12 @@ function make_include_statements() {
 MODULES=$(list_modules "modules/")
 for MODULE in $MODULES
 do
-    SOURCES=$(list_sources "modules/$MODULE/auto-test/src-c")
+    SOURCES=$(list_sources "modules/$MODULE/tests/unit-tests/src-c")
     INCLUDE_STATEMENTS=$(make_include_statements $MODULE)
-    gcc -o $PROJECT_PATH/.build/test-$MODULE.elf             \
+    gcc -o $PROJECT_PATH/.build/test-$MODULE.elf        \
         $SOURCES                                        \
         .build/archives/*.a                             \
-        -I "modules/$MODULE/auto-test/inc-c"            \
+        -I "modules/$MODULE/tests/unit-tests/inc-c"      \
         $INCLUDE_STATEMENTS
 
     ./.build/test-$MODULE.elf