diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53ef4e6c..6bac86d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/out/build)
 
 #include project folders
 add_subdirectory(src/main/c/src)
-add_subdirectory(test/c)
+add_subdirectory(src/test/c)
 
 # Find sources
 # file(GLOB_RECURSE SOURCES src/main/c/src/**.c)
diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md
index eece847f..37bc826e 100644
--- a/docs/src/progress/renderertodo.md
+++ b/docs/src/progress/renderertodo.md
@@ -1249,6 +1249,7 @@ Fix doxygen also pointing at native code lib folder
 Fix arena loading
 Refactoring fluid sim code
 Refactoring fluid sim headers
+Refactor native test code under src/test
 
 
 
diff --git a/test/c/CMakeLists.txt b/src/test/c/CMakeLists.txt
similarity index 100%
rename from test/c/CMakeLists.txt
rename to src/test/c/CMakeLists.txt
diff --git a/test/c/StormEngineTests.c b/src/test/c/StormEngineTests.c
similarity index 100%
rename from test/c/StormEngineTests.c
rename to src/test/c/StormEngineTests.c
diff --git a/test/c/fluid/chunk_test_utils.h b/src/test/c/fluid/chunk_test_utils.h
similarity index 100%
rename from test/c/fluid/chunk_test_utils.h
rename to src/test/c/fluid/chunk_test_utils.h
diff --git a/test/c/fluid/chunk_tests.c b/src/test/c/fluid/chunk_tests.c
similarity index 100%
rename from test/c/fluid/chunk_tests.c
rename to src/test/c/fluid/chunk_tests.c
diff --git a/test/c/fluid/islandsolver_tests.c b/src/test/c/fluid/islandsolver_tests.c
similarity index 100%
rename from test/c/fluid/islandsolver_tests.c
rename to src/test/c/fluid/islandsolver_tests.c
diff --git a/test/c/fluid/sparsesimulator_tests.c b/src/test/c/fluid/sparsesimulator_tests.c
similarity index 100%
rename from test/c/fluid/sparsesimulator_tests.c
rename to src/test/c/fluid/sparsesimulator_tests.c
diff --git a/test/c/test.c b/src/test/c/test.c
similarity index 100%
rename from test/c/test.c
rename to src/test/c/test.c
diff --git a/test/c/test.h b/src/test/c/test.h
similarity index 100%
rename from test/c/test.h
rename to src/test/c/test.h