diff --git a/.github/external_ci/.drone.yml b/.github/external_ci/.drone.yml
index 3cdefe4b9..0d9e3d0be 100644
--- a/.github/external_ci/.drone.yml
+++ b/.github/external_ci/.drone.yml
@@ -18,5 +18,5 @@ steps:
   - cd build
   - ../cmake-3.20.2/bin/cmake .. -DJSON_FastTests=ON
   - make -j10
-  - cd test
+  - cd tests
   - ../../cmake-3.20.2/bin/ctest -j10
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68bba9cf4..8f65d9a32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,7 +136,7 @@ CONFIGURE_FILE(
 if (JSON_BuildTests)
     include(CTest)
     enable_testing()
-    add_subdirectory(test)
+    add_subdirectory(tests)
 endif()
 
 ##
diff --git a/Makefile b/Makefile
index 8858b4325..28de14dce 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ doctest:
 run_benchmarks:
 	rm -fr cmake-build-benchmarks
 	mkdir cmake-build-benchmarks
-	cd cmake-build-benchmarks ; cmake ../test/benchmarks -GNinja -DCMAKE_BUILD_TYPE=Release
+	cd cmake-build-benchmarks ; cmake ../tests/benchmarks -GNinja -DCMAKE_BUILD_TYPE=Release
 	cd cmake-build-benchmarks ; ninja
 	cd cmake-build-benchmarks ; ./json_benchmarks
 
@@ -68,41 +68,41 @@ run_benchmarks:
 fuzz_testing:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_afl_fuzzer -C test CXX=afl-clang++
-	mv test/parse_afl_fuzzer fuzz-testing/fuzzer
-	find test/data/json_tests -size -5k -name *json | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_afl_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_afl_fuzzer fuzz-testing/fuzzer
+	find tests/data/json_tests -size -5k -name *json | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_bson:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_bson_fuzzer -C test CXX=afl-clang++
-	mv test/parse_bson_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.bson | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_bson_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_bson_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.bson | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_cbor:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_cbor_fuzzer -C test CXX=afl-clang++
-	mv test/parse_cbor_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.cbor | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_cbor_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_cbor_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.cbor | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_msgpack:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_msgpack_fuzzer -C test CXX=afl-clang++
-	mv test/parse_msgpack_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.msgpack | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_msgpack_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_msgpack_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.msgpack | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzz_testing_ubjson:
 	rm -fr fuzz-testing
 	mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out
-	$(MAKE) parse_ubjson_fuzzer -C test CXX=afl-clang++
-	mv test/parse_ubjson_fuzzer fuzz-testing/fuzzer
-	find test/data -size -5k -name *.ubjson | xargs -I{} cp "{}" fuzz-testing/testcases
+	$(MAKE) parse_ubjson_fuzzer -C tests CXX=afl-clang++
+	mv tests/parse_ubjson_fuzzer fuzz-testing/fuzzer
+	find tests/data -size -5k -name *.ubjson | xargs -I{} cp "{}" fuzz-testing/testcases
 	@echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer"
 
 fuzzing-start:
@@ -159,11 +159,11 @@ pretty:
 	    --preserve-date \
 	    --suffix=none \
 	    --formatted \
-	   $(SRCS) $(AMALGAMATED_FILE) test/src/*.cpp test/src/*.hpp test/benchmarks/src/benchmarks.cpp docs/examples/*.cpp
+	   $(SRCS) $(AMALGAMATED_FILE) tests/src/*.cpp tests/src/*.hpp tests/benchmarks/src/benchmarks.cpp docs/examples/*.cpp
 
 # call the Clang-Format on all source files
 pretty_format:
-	for FILE in $(SRCS) $(AMALGAMATED_FILE) test/src/*.cpp test/src/*.hpp benchmarks/src/benchmarks.cpp docs/examples/*.cpp; do echo $$FILE; clang-format -i $$FILE; done
+	for FILE in $(SRCS) $(AMALGAMATED_FILE) tests/src/*.cpp tests/src/*.hpp benchmarks/src/benchmarks.cpp docs/examples/*.cpp; do echo $$FILE; clang-format -i $$FILE; done
 
 # create single header file
 amalgamate: $(AMALGAMATED_FILE)
@@ -233,7 +233,7 @@ release: include.zip json.tar.xz
 
 # clean up
 clean:
-	rm -fr fuzz fuzz-testing *.dSYM test/*.dSYM
+	rm -fr fuzz fuzz-testing *.dSYM tests/*.dSYM
 	rm -fr benchmarks/files/numbers/*.json
 	rm -fr cmake-build-benchmarks fuzz-testing cmake-build-pvs-studio release_files
 	$(MAKE) clean -Cdocs
diff --git a/README.md b/README.md
index 571a25c0a..a46a8569c 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ There are myriads of [JSON](https://json.org) libraries out there, and each may
 
 - **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.
 
-- **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/tree/develop/test/src) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](https://valgrind.org) and the [Clang Sanitizers](https://clang.llvm.org/docs/index.html) that there are no memory leaks. [Google OSS-Fuzz](https://github.com/google/oss-fuzz/tree/master/projects/json) additionally runs fuzz tests against all parsers 24/7, effectively executing billions of tests so far. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289).
+- **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/tree/develop/tests/src) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](https://valgrind.org) and the [Clang Sanitizers](https://clang.llvm.org/docs/index.html) that there are no memory leaks. [Google OSS-Fuzz](https://github.com/google/oss-fuzz/tree/master/projects/json) additionally runs fuzz tests against all parsers 24/7, effectively executing billions of tests so far. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289).
 
 Other aspects were not so important to us:
 
@@ -857,7 +857,7 @@ namespace nlohmann {
 
 #### Can I write my own serializer? (Advanced use)
 
-Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/test/src/unit-udt.cpp) in the test suite, to see a few examples.
+Yes. You might want to take a look at [`unit-udt.cpp`](https://github.com/nlohmann/json/blob/develop/tests/src/unit-udt.cpp) in the test suite, to see a few examples.
 
 If you write your own serializer, you'll need to do a few things:
 
diff --git a/cmake/ci.cmake b/cmake/ci.cmake
index 19acd811f..a1a1cac63 100644
--- a/cmake/ci.cmake
+++ b/cmake/ci.cmake
@@ -542,9 +542,9 @@ set(ASTYLE_FLAGS --style=allman --indent=spaces=4 --indent-modifiers --indent-sw
 
 file(GLOB_RECURSE INDENT_FILES
     ${PROJECT_SOURCE_DIR}/include/nlohmann/*.hpp
-    ${PROJECT_SOURCE_DIR}/test/src/*.cpp
-    ${PROJECT_SOURCE_DIR}/test/src/*.hpp
-    ${PROJECT_SOURCE_DIR}/test/benchmarks/src/benchmarks.cpp
+        ${PROJECT_SOURCE_DIR}/tests/src/*.cpp
+        ${PROJECT_SOURCE_DIR}/tests/src/*.hpp
+        ${PROJECT_SOURCE_DIR}/tests/benchmarks/src/benchmarks.cpp
     ${PROJECT_SOURCE_DIR}/docs/examples/*.cpp
 )
 
diff --git a/test/CMakeLists.txt b/tests/CMakeLists.txt
similarity index 100%
rename from test/CMakeLists.txt
rename to tests/CMakeLists.txt
diff --git a/test/Makefile b/tests/Makefile
similarity index 100%
rename from test/Makefile
rename to tests/Makefile
diff --git a/test/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
similarity index 100%
rename from test/benchmarks/CMakeLists.txt
rename to tests/benchmarks/CMakeLists.txt
diff --git a/test/benchmarks/src/benchmarks.cpp b/tests/benchmarks/src/benchmarks.cpp
similarity index 100%
rename from test/benchmarks/src/benchmarks.cpp
rename to tests/benchmarks/src/benchmarks.cpp
diff --git a/test/cmake_add_subdirectory/CMakeLists.txt b/tests/cmake_add_subdirectory/CMakeLists.txt
similarity index 100%
rename from test/cmake_add_subdirectory/CMakeLists.txt
rename to tests/cmake_add_subdirectory/CMakeLists.txt
diff --git a/test/cmake_add_subdirectory/project/CMakeLists.txt b/tests/cmake_add_subdirectory/project/CMakeLists.txt
similarity index 100%
rename from test/cmake_add_subdirectory/project/CMakeLists.txt
rename to tests/cmake_add_subdirectory/project/CMakeLists.txt
diff --git a/test/cmake_add_subdirectory/project/main.cpp b/tests/cmake_add_subdirectory/project/main.cpp
similarity index 100%
rename from test/cmake_add_subdirectory/project/main.cpp
rename to tests/cmake_add_subdirectory/project/main.cpp
diff --git a/test/cmake_fetch_content/CMakeLists.txt b/tests/cmake_fetch_content/CMakeLists.txt
similarity index 100%
rename from test/cmake_fetch_content/CMakeLists.txt
rename to tests/cmake_fetch_content/CMakeLists.txt
diff --git a/test/cmake_fetch_content/project/CMakeLists.txt b/tests/cmake_fetch_content/project/CMakeLists.txt
similarity index 100%
rename from test/cmake_fetch_content/project/CMakeLists.txt
rename to tests/cmake_fetch_content/project/CMakeLists.txt
diff --git a/test/cmake_fetch_content/project/main.cpp b/tests/cmake_fetch_content/project/main.cpp
similarity index 100%
rename from test/cmake_fetch_content/project/main.cpp
rename to tests/cmake_fetch_content/project/main.cpp
diff --git a/test/cmake_fetch_content2/CMakeLists.txt b/tests/cmake_fetch_content2/CMakeLists.txt
similarity index 100%
rename from test/cmake_fetch_content2/CMakeLists.txt
rename to tests/cmake_fetch_content2/CMakeLists.txt
diff --git a/test/cmake_fetch_content2/project/CMakeLists.txt b/tests/cmake_fetch_content2/project/CMakeLists.txt
similarity index 100%
rename from test/cmake_fetch_content2/project/CMakeLists.txt
rename to tests/cmake_fetch_content2/project/CMakeLists.txt
diff --git a/test/cmake_fetch_content2/project/main.cpp b/tests/cmake_fetch_content2/project/main.cpp
similarity index 100%
rename from test/cmake_fetch_content2/project/main.cpp
rename to tests/cmake_fetch_content2/project/main.cpp
diff --git a/test/cmake_import/CMakeLists.txt b/tests/cmake_import/CMakeLists.txt
similarity index 100%
rename from test/cmake_import/CMakeLists.txt
rename to tests/cmake_import/CMakeLists.txt
diff --git a/test/cmake_import/project/CMakeLists.txt b/tests/cmake_import/project/CMakeLists.txt
similarity index 100%
rename from test/cmake_import/project/CMakeLists.txt
rename to tests/cmake_import/project/CMakeLists.txt
diff --git a/test/cmake_import/project/main.cpp b/tests/cmake_import/project/main.cpp
similarity index 100%
rename from test/cmake_import/project/main.cpp
rename to tests/cmake_import/project/main.cpp
diff --git a/test/cmake_import_minver/CMakeLists.txt b/tests/cmake_import_minver/CMakeLists.txt
similarity index 100%
rename from test/cmake_import_minver/CMakeLists.txt
rename to tests/cmake_import_minver/CMakeLists.txt
diff --git a/test/cmake_import_minver/project/CMakeLists.txt b/tests/cmake_import_minver/project/CMakeLists.txt
similarity index 100%
rename from test/cmake_import_minver/project/CMakeLists.txt
rename to tests/cmake_import_minver/project/CMakeLists.txt
diff --git a/test/cmake_import_minver/project/main.cpp b/tests/cmake_import_minver/project/main.cpp
similarity index 100%
rename from test/cmake_import_minver/project/main.cpp
rename to tests/cmake_import_minver/project/main.cpp
diff --git a/test/cmake_target_include_directories/CMakeLists.txt b/tests/cmake_target_include_directories/CMakeLists.txt
similarity index 100%
rename from test/cmake_target_include_directories/CMakeLists.txt
rename to tests/cmake_target_include_directories/CMakeLists.txt
diff --git a/test/cmake_target_include_directories/project/Bar.cpp b/tests/cmake_target_include_directories/project/Bar.cpp
similarity index 100%
rename from test/cmake_target_include_directories/project/Bar.cpp
rename to tests/cmake_target_include_directories/project/Bar.cpp
diff --git a/test/cmake_target_include_directories/project/Bar.hpp b/tests/cmake_target_include_directories/project/Bar.hpp
similarity index 100%
rename from test/cmake_target_include_directories/project/Bar.hpp
rename to tests/cmake_target_include_directories/project/Bar.hpp
diff --git a/test/cmake_target_include_directories/project/CMakeLists.txt b/tests/cmake_target_include_directories/project/CMakeLists.txt
similarity index 100%
rename from test/cmake_target_include_directories/project/CMakeLists.txt
rename to tests/cmake_target_include_directories/project/CMakeLists.txt
diff --git a/test/cmake_target_include_directories/project/Foo.cpp b/tests/cmake_target_include_directories/project/Foo.cpp
similarity index 100%
rename from test/cmake_target_include_directories/project/Foo.cpp
rename to tests/cmake_target_include_directories/project/Foo.cpp
diff --git a/test/cmake_target_include_directories/project/Foo.hpp b/tests/cmake_target_include_directories/project/Foo.hpp
similarity index 100%
rename from test/cmake_target_include_directories/project/Foo.hpp
rename to tests/cmake_target_include_directories/project/Foo.hpp
diff --git a/test/cmake_target_include_directories/project/main.cpp b/tests/cmake_target_include_directories/project/main.cpp
similarity index 100%
rename from test/cmake_target_include_directories/project/main.cpp
rename to tests/cmake_target_include_directories/project/main.cpp
diff --git a/test/cuda_example/CMakeLists.txt b/tests/cuda_example/CMakeLists.txt
similarity index 100%
rename from test/cuda_example/CMakeLists.txt
rename to tests/cuda_example/CMakeLists.txt
diff --git a/test/cuda_example/json_cuda.cu b/tests/cuda_example/json_cuda.cu
similarity index 100%
rename from test/cuda_example/json_cuda.cu
rename to tests/cuda_example/json_cuda.cu
diff --git a/test/reports/2016-08-29-fuzz/exec_speed.png b/tests/reports/2016-08-29-fuzz/exec_speed.png
similarity index 100%
rename from test/reports/2016-08-29-fuzz/exec_speed.png
rename to tests/reports/2016-08-29-fuzz/exec_speed.png
diff --git a/test/reports/2016-08-29-fuzz/fuzz.tiff b/tests/reports/2016-08-29-fuzz/fuzz.tiff
similarity index 100%
rename from test/reports/2016-08-29-fuzz/fuzz.tiff
rename to tests/reports/2016-08-29-fuzz/fuzz.tiff
diff --git a/test/reports/2016-08-29-fuzz/high_freq.png b/tests/reports/2016-08-29-fuzz/high_freq.png
similarity index 100%
rename from test/reports/2016-08-29-fuzz/high_freq.png
rename to tests/reports/2016-08-29-fuzz/high_freq.png
diff --git a/test/reports/2016-08-29-fuzz/index.html b/tests/reports/2016-08-29-fuzz/index.html
similarity index 100%
rename from test/reports/2016-08-29-fuzz/index.html
rename to tests/reports/2016-08-29-fuzz/index.html
diff --git a/test/reports/2016-08-29-fuzz/low_freq.png b/tests/reports/2016-08-29-fuzz/low_freq.png
similarity index 100%
rename from test/reports/2016-08-29-fuzz/low_freq.png
rename to tests/reports/2016-08-29-fuzz/low_freq.png
diff --git a/test/reports/2016-09-09-nativejson_benchmark/README.md b/tests/reports/2016-09-09-nativejson_benchmark/README.md
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/README.md
rename to tests/reports/2016-09-09-nativejson_benchmark/README.md
diff --git a/test/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md b/tests/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md
rename to tests/reports/2016-09-09-nativejson_benchmark/conformance_Nlohmann (C++11).md
diff --git a/test/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png b/tests/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png
rename to tests/reports/2016-09-09-nativejson_benchmark/conformance_overall_Result.png
diff --git a/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png b/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png
rename to tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Memory_(byte).png
diff --git a/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png b/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png
rename to tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_1._Parse_Time_(ms).png
diff --git a/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png b/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png
rename to tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_2._Stringify_Time_(ms).png
diff --git a/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png b/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png
rename to tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_3._Prettify_Time_(ms).png
diff --git a/test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png b/tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png
similarity index 100%
rename from test/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png
rename to tests/reports/2016-09-09-nativejson_benchmark/performance_Corei7-4980HQ@2.80GHz_mac64_clang7.0_7._Code_size_FileSize_(byte).png
diff --git a/test/reports/2016-10-02-fuzz/exec_speed.png b/tests/reports/2016-10-02-fuzz/exec_speed.png
similarity index 100%
rename from test/reports/2016-10-02-fuzz/exec_speed.png
rename to tests/reports/2016-10-02-fuzz/exec_speed.png
diff --git a/test/reports/2016-10-02-fuzz/fuzz.tiff b/tests/reports/2016-10-02-fuzz/fuzz.tiff
similarity index 100%
rename from test/reports/2016-10-02-fuzz/fuzz.tiff
rename to tests/reports/2016-10-02-fuzz/fuzz.tiff
diff --git a/test/reports/2016-10-02-fuzz/high_freq.png b/tests/reports/2016-10-02-fuzz/high_freq.png
similarity index 100%
rename from test/reports/2016-10-02-fuzz/high_freq.png
rename to tests/reports/2016-10-02-fuzz/high_freq.png
diff --git a/test/reports/2016-10-02-fuzz/index.html b/tests/reports/2016-10-02-fuzz/index.html
similarity index 100%
rename from test/reports/2016-10-02-fuzz/index.html
rename to tests/reports/2016-10-02-fuzz/index.html
diff --git a/test/reports/2016-10-02-fuzz/low_freq.png b/tests/reports/2016-10-02-fuzz/low_freq.png
similarity index 100%
rename from test/reports/2016-10-02-fuzz/low_freq.png
rename to tests/reports/2016-10-02-fuzz/low_freq.png
diff --git a/test/src/fuzzer-driver_afl.cpp b/tests/src/fuzzer-driver_afl.cpp
similarity index 100%
rename from test/src/fuzzer-driver_afl.cpp
rename to tests/src/fuzzer-driver_afl.cpp
diff --git a/test/src/fuzzer-parse_bjdata.cpp b/tests/src/fuzzer-parse_bjdata.cpp
similarity index 100%
rename from test/src/fuzzer-parse_bjdata.cpp
rename to tests/src/fuzzer-parse_bjdata.cpp
diff --git a/test/src/fuzzer-parse_bson.cpp b/tests/src/fuzzer-parse_bson.cpp
similarity index 100%
rename from test/src/fuzzer-parse_bson.cpp
rename to tests/src/fuzzer-parse_bson.cpp
diff --git a/test/src/fuzzer-parse_cbor.cpp b/tests/src/fuzzer-parse_cbor.cpp
similarity index 100%
rename from test/src/fuzzer-parse_cbor.cpp
rename to tests/src/fuzzer-parse_cbor.cpp
diff --git a/test/src/fuzzer-parse_json.cpp b/tests/src/fuzzer-parse_json.cpp
similarity index 100%
rename from test/src/fuzzer-parse_json.cpp
rename to tests/src/fuzzer-parse_json.cpp
diff --git a/test/src/fuzzer-parse_msgpack.cpp b/tests/src/fuzzer-parse_msgpack.cpp
similarity index 100%
rename from test/src/fuzzer-parse_msgpack.cpp
rename to tests/src/fuzzer-parse_msgpack.cpp
diff --git a/test/src/fuzzer-parse_ubjson.cpp b/tests/src/fuzzer-parse_ubjson.cpp
similarity index 100%
rename from test/src/fuzzer-parse_ubjson.cpp
rename to tests/src/fuzzer-parse_ubjson.cpp
diff --git a/test/src/test_utils.hpp b/tests/src/test_utils.hpp
similarity index 100%
rename from test/src/test_utils.hpp
rename to tests/src/test_utils.hpp
diff --git a/test/src/unit-algorithms.cpp b/tests/src/unit-algorithms.cpp
similarity index 100%
rename from test/src/unit-algorithms.cpp
rename to tests/src/unit-algorithms.cpp
diff --git a/test/src/unit-allocator.cpp b/tests/src/unit-allocator.cpp
similarity index 100%
rename from test/src/unit-allocator.cpp
rename to tests/src/unit-allocator.cpp
diff --git a/test/src/unit-alt-string.cpp b/tests/src/unit-alt-string.cpp
similarity index 100%
rename from test/src/unit-alt-string.cpp
rename to tests/src/unit-alt-string.cpp
diff --git a/test/src/unit-assert_macro.cpp b/tests/src/unit-assert_macro.cpp
similarity index 100%
rename from test/src/unit-assert_macro.cpp
rename to tests/src/unit-assert_macro.cpp
diff --git a/test/src/unit-bjdata.cpp b/tests/src/unit-bjdata.cpp
similarity index 100%
rename from test/src/unit-bjdata.cpp
rename to tests/src/unit-bjdata.cpp
diff --git a/test/src/unit-bson.cpp b/tests/src/unit-bson.cpp
similarity index 100%
rename from test/src/unit-bson.cpp
rename to tests/src/unit-bson.cpp
diff --git a/test/src/unit-byte_container_with_subtype.cpp b/tests/src/unit-byte_container_with_subtype.cpp
similarity index 100%
rename from test/src/unit-byte_container_with_subtype.cpp
rename to tests/src/unit-byte_container_with_subtype.cpp
diff --git a/test/src/unit-capacity.cpp b/tests/src/unit-capacity.cpp
similarity index 100%
rename from test/src/unit-capacity.cpp
rename to tests/src/unit-capacity.cpp
diff --git a/test/src/unit-cbor.cpp b/tests/src/unit-cbor.cpp
similarity index 100%
rename from test/src/unit-cbor.cpp
rename to tests/src/unit-cbor.cpp
diff --git a/test/src/unit-class_const_iterator.cpp b/tests/src/unit-class_const_iterator.cpp
similarity index 100%
rename from test/src/unit-class_const_iterator.cpp
rename to tests/src/unit-class_const_iterator.cpp
diff --git a/test/src/unit-class_iterator.cpp b/tests/src/unit-class_iterator.cpp
similarity index 100%
rename from test/src/unit-class_iterator.cpp
rename to tests/src/unit-class_iterator.cpp
diff --git a/test/src/unit-class_lexer.cpp b/tests/src/unit-class_lexer.cpp
similarity index 100%
rename from test/src/unit-class_lexer.cpp
rename to tests/src/unit-class_lexer.cpp
diff --git a/test/src/unit-class_parser.cpp b/tests/src/unit-class_parser.cpp
similarity index 100%
rename from test/src/unit-class_parser.cpp
rename to tests/src/unit-class_parser.cpp
diff --git a/test/src/unit-comparison.cpp b/tests/src/unit-comparison.cpp
similarity index 100%
rename from test/src/unit-comparison.cpp
rename to tests/src/unit-comparison.cpp
diff --git a/test/src/unit-concepts.cpp b/tests/src/unit-concepts.cpp
similarity index 100%
rename from test/src/unit-concepts.cpp
rename to tests/src/unit-concepts.cpp
diff --git a/test/src/unit-constructor1.cpp b/tests/src/unit-constructor1.cpp
similarity index 100%
rename from test/src/unit-constructor1.cpp
rename to tests/src/unit-constructor1.cpp
diff --git a/test/src/unit-constructor2.cpp b/tests/src/unit-constructor2.cpp
similarity index 100%
rename from test/src/unit-constructor2.cpp
rename to tests/src/unit-constructor2.cpp
diff --git a/test/src/unit-convenience.cpp b/tests/src/unit-convenience.cpp
similarity index 100%
rename from test/src/unit-convenience.cpp
rename to tests/src/unit-convenience.cpp
diff --git a/test/src/unit-conversions.cpp b/tests/src/unit-conversions.cpp
similarity index 100%
rename from test/src/unit-conversions.cpp
rename to tests/src/unit-conversions.cpp
diff --git a/test/src/unit-deserialization.cpp b/tests/src/unit-deserialization.cpp
similarity index 100%
rename from test/src/unit-deserialization.cpp
rename to tests/src/unit-deserialization.cpp
diff --git a/test/src/unit-diagnostics.cpp b/tests/src/unit-diagnostics.cpp
similarity index 100%
rename from test/src/unit-diagnostics.cpp
rename to tests/src/unit-diagnostics.cpp
diff --git a/test/src/unit-disabled_exceptions.cpp b/tests/src/unit-disabled_exceptions.cpp
similarity index 100%
rename from test/src/unit-disabled_exceptions.cpp
rename to tests/src/unit-disabled_exceptions.cpp
diff --git a/test/src/unit-element_access1.cpp b/tests/src/unit-element_access1.cpp
similarity index 100%
rename from test/src/unit-element_access1.cpp
rename to tests/src/unit-element_access1.cpp
diff --git a/test/src/unit-element_access2.cpp b/tests/src/unit-element_access2.cpp
similarity index 100%
rename from test/src/unit-element_access2.cpp
rename to tests/src/unit-element_access2.cpp
diff --git a/test/src/unit-hash.cpp b/tests/src/unit-hash.cpp
similarity index 100%
rename from test/src/unit-hash.cpp
rename to tests/src/unit-hash.cpp
diff --git a/test/src/unit-inspection.cpp b/tests/src/unit-inspection.cpp
similarity index 100%
rename from test/src/unit-inspection.cpp
rename to tests/src/unit-inspection.cpp
diff --git a/test/src/unit-items.cpp b/tests/src/unit-items.cpp
similarity index 100%
rename from test/src/unit-items.cpp
rename to tests/src/unit-items.cpp
diff --git a/test/src/unit-iterators1.cpp b/tests/src/unit-iterators1.cpp
similarity index 100%
rename from test/src/unit-iterators1.cpp
rename to tests/src/unit-iterators1.cpp
diff --git a/test/src/unit-iterators2.cpp b/tests/src/unit-iterators2.cpp
similarity index 100%
rename from test/src/unit-iterators2.cpp
rename to tests/src/unit-iterators2.cpp
diff --git a/test/src/unit-json_patch.cpp b/tests/src/unit-json_patch.cpp
similarity index 100%
rename from test/src/unit-json_patch.cpp
rename to tests/src/unit-json_patch.cpp
diff --git a/test/src/unit-json_pointer.cpp b/tests/src/unit-json_pointer.cpp
similarity index 100%
rename from test/src/unit-json_pointer.cpp
rename to tests/src/unit-json_pointer.cpp
diff --git a/test/src/unit-large_json.cpp b/tests/src/unit-large_json.cpp
similarity index 100%
rename from test/src/unit-large_json.cpp
rename to tests/src/unit-large_json.cpp
diff --git a/test/src/unit-merge_patch.cpp b/tests/src/unit-merge_patch.cpp
similarity index 100%
rename from test/src/unit-merge_patch.cpp
rename to tests/src/unit-merge_patch.cpp
diff --git a/test/src/unit-meta.cpp b/tests/src/unit-meta.cpp
similarity index 100%
rename from test/src/unit-meta.cpp
rename to tests/src/unit-meta.cpp
diff --git a/test/src/unit-modifiers.cpp b/tests/src/unit-modifiers.cpp
similarity index 100%
rename from test/src/unit-modifiers.cpp
rename to tests/src/unit-modifiers.cpp
diff --git a/test/src/unit-msgpack.cpp b/tests/src/unit-msgpack.cpp
similarity index 100%
rename from test/src/unit-msgpack.cpp
rename to tests/src/unit-msgpack.cpp
diff --git a/test/src/unit-noexcept.cpp b/tests/src/unit-noexcept.cpp
similarity index 100%
rename from test/src/unit-noexcept.cpp
rename to tests/src/unit-noexcept.cpp
diff --git a/test/src/unit-ordered_json.cpp b/tests/src/unit-ordered_json.cpp
similarity index 100%
rename from test/src/unit-ordered_json.cpp
rename to tests/src/unit-ordered_json.cpp
diff --git a/test/src/unit-ordered_map.cpp b/tests/src/unit-ordered_map.cpp
similarity index 100%
rename from test/src/unit-ordered_map.cpp
rename to tests/src/unit-ordered_map.cpp
diff --git a/test/src/unit-pointer_access.cpp b/tests/src/unit-pointer_access.cpp
similarity index 100%
rename from test/src/unit-pointer_access.cpp
rename to tests/src/unit-pointer_access.cpp
diff --git a/test/src/unit-readme.cpp b/tests/src/unit-readme.cpp
similarity index 100%
rename from test/src/unit-readme.cpp
rename to tests/src/unit-readme.cpp
diff --git a/test/src/unit-reference_access.cpp b/tests/src/unit-reference_access.cpp
similarity index 100%
rename from test/src/unit-reference_access.cpp
rename to tests/src/unit-reference_access.cpp
diff --git a/test/src/unit-regression1.cpp b/tests/src/unit-regression1.cpp
similarity index 100%
rename from test/src/unit-regression1.cpp
rename to tests/src/unit-regression1.cpp
diff --git a/test/src/unit-regression2.cpp b/tests/src/unit-regression2.cpp
similarity index 100%
rename from test/src/unit-regression2.cpp
rename to tests/src/unit-regression2.cpp
diff --git a/test/src/unit-serialization.cpp b/tests/src/unit-serialization.cpp
similarity index 100%
rename from test/src/unit-serialization.cpp
rename to tests/src/unit-serialization.cpp
diff --git a/test/src/unit-testsuites.cpp b/tests/src/unit-testsuites.cpp
similarity index 100%
rename from test/src/unit-testsuites.cpp
rename to tests/src/unit-testsuites.cpp
diff --git a/test/src/unit-to_chars.cpp b/tests/src/unit-to_chars.cpp
similarity index 100%
rename from test/src/unit-to_chars.cpp
rename to tests/src/unit-to_chars.cpp
diff --git a/test/src/unit-ubjson.cpp b/tests/src/unit-ubjson.cpp
similarity index 100%
rename from test/src/unit-ubjson.cpp
rename to tests/src/unit-ubjson.cpp
diff --git a/test/src/unit-udt.cpp b/tests/src/unit-udt.cpp
similarity index 100%
rename from test/src/unit-udt.cpp
rename to tests/src/unit-udt.cpp
diff --git a/test/src/unit-udt_macro.cpp b/tests/src/unit-udt_macro.cpp
similarity index 100%
rename from test/src/unit-udt_macro.cpp
rename to tests/src/unit-udt_macro.cpp
diff --git a/test/src/unit-unicode1.cpp b/tests/src/unit-unicode1.cpp
similarity index 100%
rename from test/src/unit-unicode1.cpp
rename to tests/src/unit-unicode1.cpp
diff --git a/test/src/unit-unicode2.cpp b/tests/src/unit-unicode2.cpp
similarity index 100%
rename from test/src/unit-unicode2.cpp
rename to tests/src/unit-unicode2.cpp
diff --git a/test/src/unit-unicode3.cpp b/tests/src/unit-unicode3.cpp
similarity index 100%
rename from test/src/unit-unicode3.cpp
rename to tests/src/unit-unicode3.cpp
diff --git a/test/src/unit-unicode4.cpp b/tests/src/unit-unicode4.cpp
similarity index 100%
rename from test/src/unit-unicode4.cpp
rename to tests/src/unit-unicode4.cpp
diff --git a/test/src/unit-unicode5.cpp b/tests/src/unit-unicode5.cpp
similarity index 100%
rename from test/src/unit-unicode5.cpp
rename to tests/src/unit-unicode5.cpp
diff --git a/test/src/unit-user_defined_input.cpp b/tests/src/unit-user_defined_input.cpp
similarity index 100%
rename from test/src/unit-user_defined_input.cpp
rename to tests/src/unit-user_defined_input.cpp
diff --git a/test/src/unit-wstring.cpp b/tests/src/unit-wstring.cpp
similarity index 100%
rename from test/src/unit-wstring.cpp
rename to tests/src/unit-wstring.cpp
diff --git a/test/src/unit.cpp b/tests/src/unit.cpp
similarity index 100%
rename from test/src/unit.cpp
rename to tests/src/unit.cpp
diff --git a/test/thirdparty/Fuzzer/CMakeLists.txt b/tests/thirdparty/Fuzzer/CMakeLists.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/CMakeLists.txt
rename to tests/thirdparty/Fuzzer/CMakeLists.txt
diff --git a/test/thirdparty/Fuzzer/FuzzerCorpus.h b/tests/thirdparty/Fuzzer/FuzzerCorpus.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerCorpus.h
rename to tests/thirdparty/Fuzzer/FuzzerCorpus.h
diff --git a/test/thirdparty/Fuzzer/FuzzerCrossOver.cpp b/tests/thirdparty/Fuzzer/FuzzerCrossOver.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerCrossOver.cpp
rename to tests/thirdparty/Fuzzer/FuzzerCrossOver.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerDefs.h b/tests/thirdparty/Fuzzer/FuzzerDefs.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerDefs.h
rename to tests/thirdparty/Fuzzer/FuzzerDefs.h
diff --git a/test/thirdparty/Fuzzer/FuzzerDictionary.h b/tests/thirdparty/Fuzzer/FuzzerDictionary.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerDictionary.h
rename to tests/thirdparty/Fuzzer/FuzzerDictionary.h
diff --git a/test/thirdparty/Fuzzer/FuzzerDriver.cpp b/tests/thirdparty/Fuzzer/FuzzerDriver.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerDriver.cpp
rename to tests/thirdparty/Fuzzer/FuzzerDriver.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerExtFunctions.def b/tests/thirdparty/Fuzzer/FuzzerExtFunctions.def
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerExtFunctions.def
rename to tests/thirdparty/Fuzzer/FuzzerExtFunctions.def
diff --git a/test/thirdparty/Fuzzer/FuzzerExtFunctions.h b/tests/thirdparty/Fuzzer/FuzzerExtFunctions.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerExtFunctions.h
rename to tests/thirdparty/Fuzzer/FuzzerExtFunctions.h
diff --git a/test/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp b/tests/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp
rename to tests/thirdparty/Fuzzer/FuzzerExtFunctionsDlsym.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp b/tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp
rename to tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeak.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp b/tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp
rename to tests/thirdparty/Fuzzer/FuzzerExtFunctionsWeakAlias.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerFlags.def b/tests/thirdparty/Fuzzer/FuzzerFlags.def
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerFlags.def
rename to tests/thirdparty/Fuzzer/FuzzerFlags.def
diff --git a/test/thirdparty/Fuzzer/FuzzerIO.cpp b/tests/thirdparty/Fuzzer/FuzzerIO.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerIO.cpp
rename to tests/thirdparty/Fuzzer/FuzzerIO.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerIO.h b/tests/thirdparty/Fuzzer/FuzzerIO.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerIO.h
rename to tests/thirdparty/Fuzzer/FuzzerIO.h
diff --git a/test/thirdparty/Fuzzer/FuzzerIOPosix.cpp b/tests/thirdparty/Fuzzer/FuzzerIOPosix.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerIOPosix.cpp
rename to tests/thirdparty/Fuzzer/FuzzerIOPosix.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerIOWindows.cpp b/tests/thirdparty/Fuzzer/FuzzerIOWindows.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerIOWindows.cpp
rename to tests/thirdparty/Fuzzer/FuzzerIOWindows.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerInterface.h b/tests/thirdparty/Fuzzer/FuzzerInterface.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerInterface.h
rename to tests/thirdparty/Fuzzer/FuzzerInterface.h
diff --git a/test/thirdparty/Fuzzer/FuzzerInternal.h b/tests/thirdparty/Fuzzer/FuzzerInternal.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerInternal.h
rename to tests/thirdparty/Fuzzer/FuzzerInternal.h
diff --git a/test/thirdparty/Fuzzer/FuzzerLoop.cpp b/tests/thirdparty/Fuzzer/FuzzerLoop.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerLoop.cpp
rename to tests/thirdparty/Fuzzer/FuzzerLoop.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerMain.cpp b/tests/thirdparty/Fuzzer/FuzzerMain.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerMain.cpp
rename to tests/thirdparty/Fuzzer/FuzzerMain.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerMerge.cpp b/tests/thirdparty/Fuzzer/FuzzerMerge.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerMerge.cpp
rename to tests/thirdparty/Fuzzer/FuzzerMerge.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerMerge.h b/tests/thirdparty/Fuzzer/FuzzerMerge.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerMerge.h
rename to tests/thirdparty/Fuzzer/FuzzerMerge.h
diff --git a/test/thirdparty/Fuzzer/FuzzerMutate.cpp b/tests/thirdparty/Fuzzer/FuzzerMutate.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerMutate.cpp
rename to tests/thirdparty/Fuzzer/FuzzerMutate.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerMutate.h b/tests/thirdparty/Fuzzer/FuzzerMutate.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerMutate.h
rename to tests/thirdparty/Fuzzer/FuzzerMutate.h
diff --git a/test/thirdparty/Fuzzer/FuzzerOptions.h b/tests/thirdparty/Fuzzer/FuzzerOptions.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerOptions.h
rename to tests/thirdparty/Fuzzer/FuzzerOptions.h
diff --git a/test/thirdparty/Fuzzer/FuzzerRandom.h b/tests/thirdparty/Fuzzer/FuzzerRandom.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerRandom.h
rename to tests/thirdparty/Fuzzer/FuzzerRandom.h
diff --git a/test/thirdparty/Fuzzer/FuzzerSHA1.cpp b/tests/thirdparty/Fuzzer/FuzzerSHA1.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerSHA1.cpp
rename to tests/thirdparty/Fuzzer/FuzzerSHA1.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerSHA1.h b/tests/thirdparty/Fuzzer/FuzzerSHA1.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerSHA1.h
rename to tests/thirdparty/Fuzzer/FuzzerSHA1.h
diff --git a/test/thirdparty/Fuzzer/FuzzerTracePC.cpp b/tests/thirdparty/Fuzzer/FuzzerTracePC.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerTracePC.cpp
rename to tests/thirdparty/Fuzzer/FuzzerTracePC.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerTracePC.h b/tests/thirdparty/Fuzzer/FuzzerTracePC.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerTracePC.h
rename to tests/thirdparty/Fuzzer/FuzzerTracePC.h
diff --git a/test/thirdparty/Fuzzer/FuzzerTraceState.cpp b/tests/thirdparty/Fuzzer/FuzzerTraceState.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerTraceState.cpp
rename to tests/thirdparty/Fuzzer/FuzzerTraceState.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerUtil.cpp b/tests/thirdparty/Fuzzer/FuzzerUtil.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerUtil.cpp
rename to tests/thirdparty/Fuzzer/FuzzerUtil.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerUtil.h b/tests/thirdparty/Fuzzer/FuzzerUtil.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerUtil.h
rename to tests/thirdparty/Fuzzer/FuzzerUtil.h
diff --git a/test/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp b/tests/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp
rename to tests/thirdparty/Fuzzer/FuzzerUtilDarwin.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerUtilLinux.cpp b/tests/thirdparty/Fuzzer/FuzzerUtilLinux.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerUtilLinux.cpp
rename to tests/thirdparty/Fuzzer/FuzzerUtilLinux.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerUtilPosix.cpp b/tests/thirdparty/Fuzzer/FuzzerUtilPosix.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerUtilPosix.cpp
rename to tests/thirdparty/Fuzzer/FuzzerUtilPosix.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerUtilWindows.cpp b/tests/thirdparty/Fuzzer/FuzzerUtilWindows.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerUtilWindows.cpp
rename to tests/thirdparty/Fuzzer/FuzzerUtilWindows.cpp
diff --git a/test/thirdparty/Fuzzer/FuzzerValueBitMap.h b/tests/thirdparty/Fuzzer/FuzzerValueBitMap.h
similarity index 100%
rename from test/thirdparty/Fuzzer/FuzzerValueBitMap.h
rename to tests/thirdparty/Fuzzer/FuzzerValueBitMap.h
diff --git a/test/thirdparty/Fuzzer/README.txt b/tests/thirdparty/Fuzzer/README.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/README.txt
rename to tests/thirdparty/Fuzzer/README.txt
diff --git a/test/thirdparty/Fuzzer/afl/afl_driver.cpp b/tests/thirdparty/Fuzzer/afl/afl_driver.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/afl/afl_driver.cpp
rename to tests/thirdparty/Fuzzer/afl/afl_driver.cpp
diff --git a/test/thirdparty/Fuzzer/build.sh b/tests/thirdparty/Fuzzer/build.sh
similarity index 100%
rename from test/thirdparty/Fuzzer/build.sh
rename to tests/thirdparty/Fuzzer/build.sh
diff --git a/test/thirdparty/Fuzzer/cxx.dict b/tests/thirdparty/Fuzzer/cxx.dict
similarity index 100%
rename from test/thirdparty/Fuzzer/cxx.dict
rename to tests/thirdparty/Fuzzer/cxx.dict
diff --git a/test/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c b/tests/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c
similarity index 100%
rename from test/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c
rename to tests/thirdparty/Fuzzer/standalone/StandaloneFuzzTargetMain.c
diff --git a/test/thirdparty/Fuzzer/test/AFLDriverTest.cpp b/tests/thirdparty/Fuzzer/test/AFLDriverTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/AFLDriverTest.cpp
rename to tests/thirdparty/Fuzzer/test/AFLDriverTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp b/tests/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp
rename to tests/thirdparty/Fuzzer/test/AbsNegAndConstant64Test.cpp
diff --git a/test/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp b/tests/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp
rename to tests/thirdparty/Fuzzer/test/AbsNegAndConstantTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp b/tests/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp
rename to tests/thirdparty/Fuzzer/test/AccumulateAllocationsTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp b/tests/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp
rename to tests/thirdparty/Fuzzer/test/BufferOverflowOnInput.cpp
diff --git a/test/thirdparty/Fuzzer/test/CMakeLists.txt b/tests/thirdparty/Fuzzer/test/CMakeLists.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/test/CMakeLists.txt
rename to tests/thirdparty/Fuzzer/test/CMakeLists.txt
diff --git a/test/thirdparty/Fuzzer/test/CallerCalleeTest.cpp b/tests/thirdparty/Fuzzer/test/CallerCalleeTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/CallerCalleeTest.cpp
rename to tests/thirdparty/Fuzzer/test/CallerCalleeTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/CounterTest.cpp b/tests/thirdparty/Fuzzer/test/CounterTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/CounterTest.cpp
rename to tests/thirdparty/Fuzzer/test/CounterTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp b/tests/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp
rename to tests/thirdparty/Fuzzer/test/CustomCrossOverTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/CustomMutatorTest.cpp b/tests/thirdparty/Fuzzer/test/CustomMutatorTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/CustomMutatorTest.cpp
rename to tests/thirdparty/Fuzzer/test/CustomMutatorTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/DSO1.cpp b/tests/thirdparty/Fuzzer/test/DSO1.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/DSO1.cpp
rename to tests/thirdparty/Fuzzer/test/DSO1.cpp
diff --git a/test/thirdparty/Fuzzer/test/DSO2.cpp b/tests/thirdparty/Fuzzer/test/DSO2.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/DSO2.cpp
rename to tests/thirdparty/Fuzzer/test/DSO2.cpp
diff --git a/test/thirdparty/Fuzzer/test/DSOTestExtra.cpp b/tests/thirdparty/Fuzzer/test/DSOTestExtra.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/DSOTestExtra.cpp
rename to tests/thirdparty/Fuzzer/test/DSOTestExtra.cpp
diff --git a/test/thirdparty/Fuzzer/test/DSOTestMain.cpp b/tests/thirdparty/Fuzzer/test/DSOTestMain.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/DSOTestMain.cpp
rename to tests/thirdparty/Fuzzer/test/DSOTestMain.cpp
diff --git a/test/thirdparty/Fuzzer/test/DivTest.cpp b/tests/thirdparty/Fuzzer/test/DivTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/DivTest.cpp
rename to tests/thirdparty/Fuzzer/test/DivTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/EmptyTest.cpp b/tests/thirdparty/Fuzzer/test/EmptyTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/EmptyTest.cpp
rename to tests/thirdparty/Fuzzer/test/EmptyTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp b/tests/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp
rename to tests/thirdparty/Fuzzer/test/FourIndependentBranchesTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp b/tests/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp
rename to tests/thirdparty/Fuzzer/test/FullCoverageSetTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/FuzzerUnittest.cpp b/tests/thirdparty/Fuzzer/test/FuzzerUnittest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/FuzzerUnittest.cpp
rename to tests/thirdparty/Fuzzer/test/FuzzerUnittest.cpp
diff --git a/test/thirdparty/Fuzzer/test/InitializeTest.cpp b/tests/thirdparty/Fuzzer/test/InitializeTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/InitializeTest.cpp
rename to tests/thirdparty/Fuzzer/test/InitializeTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/LeakTest.cpp b/tests/thirdparty/Fuzzer/test/LeakTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/LeakTest.cpp
rename to tests/thirdparty/Fuzzer/test/LeakTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp b/tests/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp
rename to tests/thirdparty/Fuzzer/test/LeakTimeoutTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/LoadTest.cpp b/tests/thirdparty/Fuzzer/test/LoadTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/LoadTest.cpp
rename to tests/thirdparty/Fuzzer/test/LoadTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/MemcmpTest.cpp b/tests/thirdparty/Fuzzer/test/MemcmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/MemcmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/MemcmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/NthRunCrashTest.cpp b/tests/thirdparty/Fuzzer/test/NthRunCrashTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/NthRunCrashTest.cpp
rename to tests/thirdparty/Fuzzer/test/NthRunCrashTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp b/tests/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp
rename to tests/thirdparty/Fuzzer/test/NullDerefOnEmptyTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/NullDerefTest.cpp b/tests/thirdparty/Fuzzer/test/NullDerefTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/NullDerefTest.cpp
rename to tests/thirdparty/Fuzzer/test/NullDerefTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp b/tests/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp
rename to tests/thirdparty/Fuzzer/test/OneHugeAllocTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp b/tests/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
rename to tests/thirdparty/Fuzzer/test/OutOfMemorySingleLargeMallocTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp b/tests/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp
rename to tests/thirdparty/Fuzzer/test/OutOfMemoryTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp b/tests/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp
rename to tests/thirdparty/Fuzzer/test/RepeatedBytesTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp b/tests/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp
rename to tests/thirdparty/Fuzzer/test/RepeatedMemcmp.cpp
diff --git a/test/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp b/tests/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp
rename to tests/thirdparty/Fuzzer/test/ShrinkControlFlowTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp b/tests/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp
rename to tests/thirdparty/Fuzzer/test/ShrinkValueProfileTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp b/tests/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp
rename to tests/thirdparty/Fuzzer/test/SignedIntOverflowTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SimpleCmpTest.cpp b/tests/thirdparty/Fuzzer/test/SimpleCmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SimpleCmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/SimpleCmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp b/tests/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp
rename to tests/thirdparty/Fuzzer/test/SimpleDictionaryTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SimpleHashTest.cpp b/tests/thirdparty/Fuzzer/test/SimpleHashTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SimpleHashTest.cpp
rename to tests/thirdparty/Fuzzer/test/SimpleHashTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SimpleTest.cpp b/tests/thirdparty/Fuzzer/test/SimpleTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SimpleTest.cpp
rename to tests/thirdparty/Fuzzer/test/SimpleTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp b/tests/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp
rename to tests/thirdparty/Fuzzer/test/SimpleThreadedTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp b/tests/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/SingleMemcmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp b/tests/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/SingleStrcmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp b/tests/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/SingleStrncmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SpamyTest.cpp b/tests/thirdparty/Fuzzer/test/SpamyTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SpamyTest.cpp
rename to tests/thirdparty/Fuzzer/test/SpamyTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/StrcmpTest.cpp b/tests/thirdparty/Fuzzer/test/StrcmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/StrcmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/StrcmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp b/tests/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp
rename to tests/thirdparty/Fuzzer/test/StrncmpOOBTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/StrncmpTest.cpp b/tests/thirdparty/Fuzzer/test/StrncmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/StrncmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/StrncmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/StrstrTest.cpp b/tests/thirdparty/Fuzzer/test/StrstrTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/StrstrTest.cpp
rename to tests/thirdparty/Fuzzer/test/StrstrTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/SwapCmpTest.cpp b/tests/thirdparty/Fuzzer/test/SwapCmpTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SwapCmpTest.cpp
rename to tests/thirdparty/Fuzzer/test/SwapCmpTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/Switch2Test.cpp b/tests/thirdparty/Fuzzer/test/Switch2Test.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/Switch2Test.cpp
rename to tests/thirdparty/Fuzzer/test/Switch2Test.cpp
diff --git a/test/thirdparty/Fuzzer/test/SwitchTest.cpp b/tests/thirdparty/Fuzzer/test/SwitchTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/SwitchTest.cpp
rename to tests/thirdparty/Fuzzer/test/SwitchTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp b/tests/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp
rename to tests/thirdparty/Fuzzer/test/ThreadedLeakTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/ThreadedTest.cpp b/tests/thirdparty/Fuzzer/test/ThreadedTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/ThreadedTest.cpp
rename to tests/thirdparty/Fuzzer/test/ThreadedTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp b/tests/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp
rename to tests/thirdparty/Fuzzer/test/TimeoutEmptyTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/TimeoutTest.cpp b/tests/thirdparty/Fuzzer/test/TimeoutTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/TimeoutTest.cpp
rename to tests/thirdparty/Fuzzer/test/TimeoutTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/TraceMallocTest.cpp b/tests/thirdparty/Fuzzer/test/TraceMallocTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/TraceMallocTest.cpp
rename to tests/thirdparty/Fuzzer/test/TraceMallocTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/UninstrumentedTest.cpp b/tests/thirdparty/Fuzzer/test/UninstrumentedTest.cpp
similarity index 100%
rename from test/thirdparty/Fuzzer/test/UninstrumentedTest.cpp
rename to tests/thirdparty/Fuzzer/test/UninstrumentedTest.cpp
diff --git a/test/thirdparty/Fuzzer/test/afl-driver-extra-stats.test b/tests/thirdparty/Fuzzer/test/afl-driver-extra-stats.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/afl-driver-extra-stats.test
rename to tests/thirdparty/Fuzzer/test/afl-driver-extra-stats.test
diff --git a/test/thirdparty/Fuzzer/test/afl-driver-stderr.test b/tests/thirdparty/Fuzzer/test/afl-driver-stderr.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/afl-driver-stderr.test
rename to tests/thirdparty/Fuzzer/test/afl-driver-stderr.test
diff --git a/test/thirdparty/Fuzzer/test/caller-callee.test b/tests/thirdparty/Fuzzer/test/caller-callee.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/caller-callee.test
rename to tests/thirdparty/Fuzzer/test/caller-callee.test
diff --git a/test/thirdparty/Fuzzer/test/coverage.test b/tests/thirdparty/Fuzzer/test/coverage.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/coverage.test
rename to tests/thirdparty/Fuzzer/test/coverage.test
diff --git a/test/thirdparty/Fuzzer/test/dict1.txt b/tests/thirdparty/Fuzzer/test/dict1.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/test/dict1.txt
rename to tests/thirdparty/Fuzzer/test/dict1.txt
diff --git a/test/thirdparty/Fuzzer/test/dump_coverage.test b/tests/thirdparty/Fuzzer/test/dump_coverage.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/dump_coverage.test
rename to tests/thirdparty/Fuzzer/test/dump_coverage.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-customcrossover.test b/tests/thirdparty/Fuzzer/test/fuzzer-customcrossover.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-customcrossover.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-customcrossover.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-custommutator.test b/tests/thirdparty/Fuzzer/test/fuzzer-custommutator.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-custommutator.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-custommutator.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-dict.test b/tests/thirdparty/Fuzzer/test/fuzzer-dict.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-dict.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-dict.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-dirs.test b/tests/thirdparty/Fuzzer/test/fuzzer-dirs.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-dirs.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-dirs.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-fdmask.test b/tests/thirdparty/Fuzzer/test/fuzzer-fdmask.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-fdmask.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-fdmask.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-finalstats.test b/tests/thirdparty/Fuzzer/test/fuzzer-finalstats.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-finalstats.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-finalstats.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-flags.test b/tests/thirdparty/Fuzzer/test/fuzzer-flags.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-flags.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-flags.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-jobs.test b/tests/thirdparty/Fuzzer/test/fuzzer-jobs.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-jobs.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-jobs.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-leak.test b/tests/thirdparty/Fuzzer/test/fuzzer-leak.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-leak.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-leak.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test b/tests/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-oom-with-profile.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-oom.test b/tests/thirdparty/Fuzzer/test/fuzzer-oom.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-oom.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-oom.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test b/tests/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-printcovpcs.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-runs.test b/tests/thirdparty/Fuzzer/test/fuzzer-runs.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-runs.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-runs.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-seed.test b/tests/thirdparty/Fuzzer/test/fuzzer-seed.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-seed.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-seed.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-segv.test b/tests/thirdparty/Fuzzer/test/fuzzer-segv.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-segv.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-segv.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-singleinputs.test b/tests/thirdparty/Fuzzer/test/fuzzer-singleinputs.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-singleinputs.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-singleinputs.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-threaded.test b/tests/thirdparty/Fuzzer/test/fuzzer-threaded.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-threaded.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-threaded.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-timeout.test b/tests/thirdparty/Fuzzer/test/fuzzer-timeout.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-timeout.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-timeout.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test b/tests/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-traces-hooks.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer-ubsan.test b/tests/thirdparty/Fuzzer/test/fuzzer-ubsan.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer-ubsan.test
rename to tests/thirdparty/Fuzzer/test/fuzzer-ubsan.test
diff --git a/test/thirdparty/Fuzzer/test/fuzzer.test b/tests/thirdparty/Fuzzer/test/fuzzer.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/fuzzer.test
rename to tests/thirdparty/Fuzzer/test/fuzzer.test
diff --git a/test/thirdparty/Fuzzer/test/hi.txt b/tests/thirdparty/Fuzzer/test/hi.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/test/hi.txt
rename to tests/thirdparty/Fuzzer/test/hi.txt
diff --git a/test/thirdparty/Fuzzer/test/lit.cfg b/tests/thirdparty/Fuzzer/test/lit.cfg
similarity index 100%
rename from test/thirdparty/Fuzzer/test/lit.cfg
rename to tests/thirdparty/Fuzzer/test/lit.cfg
diff --git a/test/thirdparty/Fuzzer/test/lit.site.cfg.in b/tests/thirdparty/Fuzzer/test/lit.site.cfg.in
similarity index 100%
rename from test/thirdparty/Fuzzer/test/lit.site.cfg.in
rename to tests/thirdparty/Fuzzer/test/lit.site.cfg.in
diff --git a/test/thirdparty/Fuzzer/test/merge.test b/tests/thirdparty/Fuzzer/test/merge.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/merge.test
rename to tests/thirdparty/Fuzzer/test/merge.test
diff --git a/test/thirdparty/Fuzzer/test/minimize_crash.test b/tests/thirdparty/Fuzzer/test/minimize_crash.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/minimize_crash.test
rename to tests/thirdparty/Fuzzer/test/minimize_crash.test
diff --git a/test/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt b/tests/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt
rename to tests/thirdparty/Fuzzer/test/no-coverage/CMakeLists.txt
diff --git a/test/thirdparty/Fuzzer/test/repeated-bytes.test b/tests/thirdparty/Fuzzer/test/repeated-bytes.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/repeated-bytes.test
rename to tests/thirdparty/Fuzzer/test/repeated-bytes.test
diff --git a/test/thirdparty/Fuzzer/test/shrink.test b/tests/thirdparty/Fuzzer/test/shrink.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/shrink.test
rename to tests/thirdparty/Fuzzer/test/shrink.test
diff --git a/test/thirdparty/Fuzzer/test/simple-cmp.test b/tests/thirdparty/Fuzzer/test/simple-cmp.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/simple-cmp.test
rename to tests/thirdparty/Fuzzer/test/simple-cmp.test
diff --git a/test/thirdparty/Fuzzer/test/standalone.test b/tests/thirdparty/Fuzzer/test/standalone.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/standalone.test
rename to tests/thirdparty/Fuzzer/test/standalone.test
diff --git a/test/thirdparty/Fuzzer/test/swap-cmp.test b/tests/thirdparty/Fuzzer/test/swap-cmp.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/swap-cmp.test
rename to tests/thirdparty/Fuzzer/test/swap-cmp.test
diff --git a/test/thirdparty/Fuzzer/test/trace-malloc.test b/tests/thirdparty/Fuzzer/test/trace-malloc.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/trace-malloc.test
rename to tests/thirdparty/Fuzzer/test/trace-malloc.test
diff --git a/test/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt b/tests/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt
rename to tests/thirdparty/Fuzzer/test/ubsan/CMakeLists.txt
diff --git a/test/thirdparty/Fuzzer/test/ulimit.test b/tests/thirdparty/Fuzzer/test/ulimit.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/ulimit.test
rename to tests/thirdparty/Fuzzer/test/ulimit.test
diff --git a/test/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt b/tests/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt
similarity index 100%
rename from test/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt
rename to tests/thirdparty/Fuzzer/test/uninstrumented/CMakeLists.txt
diff --git a/test/thirdparty/Fuzzer/test/unit/lit.cfg b/tests/thirdparty/Fuzzer/test/unit/lit.cfg
similarity index 100%
rename from test/thirdparty/Fuzzer/test/unit/lit.cfg
rename to tests/thirdparty/Fuzzer/test/unit/lit.cfg
diff --git a/test/thirdparty/Fuzzer/test/unit/lit.site.cfg.in b/tests/thirdparty/Fuzzer/test/unit/lit.site.cfg.in
similarity index 100%
rename from test/thirdparty/Fuzzer/test/unit/lit.site.cfg.in
rename to tests/thirdparty/Fuzzer/test/unit/lit.site.cfg.in
diff --git a/test/thirdparty/Fuzzer/test/value-profile-cmp.test b/tests/thirdparty/Fuzzer/test/value-profile-cmp.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-cmp.test
rename to tests/thirdparty/Fuzzer/test/value-profile-cmp.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-cmp2.test b/tests/thirdparty/Fuzzer/test/value-profile-cmp2.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-cmp2.test
rename to tests/thirdparty/Fuzzer/test/value-profile-cmp2.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-cmp3.test b/tests/thirdparty/Fuzzer/test/value-profile-cmp3.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-cmp3.test
rename to tests/thirdparty/Fuzzer/test/value-profile-cmp3.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-cmp4.test b/tests/thirdparty/Fuzzer/test/value-profile-cmp4.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-cmp4.test
rename to tests/thirdparty/Fuzzer/test/value-profile-cmp4.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-div.test b/tests/thirdparty/Fuzzer/test/value-profile-div.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-div.test
rename to tests/thirdparty/Fuzzer/test/value-profile-div.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-load.test b/tests/thirdparty/Fuzzer/test/value-profile-load.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-load.test
rename to tests/thirdparty/Fuzzer/test/value-profile-load.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-mem.test b/tests/thirdparty/Fuzzer/test/value-profile-mem.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-mem.test
rename to tests/thirdparty/Fuzzer/test/value-profile-mem.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-set.test b/tests/thirdparty/Fuzzer/test/value-profile-set.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-set.test
rename to tests/thirdparty/Fuzzer/test/value-profile-set.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-strcmp.test b/tests/thirdparty/Fuzzer/test/value-profile-strcmp.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-strcmp.test
rename to tests/thirdparty/Fuzzer/test/value-profile-strcmp.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-strncmp.test b/tests/thirdparty/Fuzzer/test/value-profile-strncmp.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-strncmp.test
rename to tests/thirdparty/Fuzzer/test/value-profile-strncmp.test
diff --git a/test/thirdparty/Fuzzer/test/value-profile-switch.test b/tests/thirdparty/Fuzzer/test/value-profile-switch.test
similarity index 100%
rename from test/thirdparty/Fuzzer/test/value-profile-switch.test
rename to tests/thirdparty/Fuzzer/test/value-profile-switch.test
diff --git a/test/thirdparty/doctest/LICENSE.txt b/tests/thirdparty/doctest/LICENSE.txt
similarity index 100%
rename from test/thirdparty/doctest/LICENSE.txt
rename to tests/thirdparty/doctest/LICENSE.txt
diff --git a/test/thirdparty/doctest/doctest.h b/tests/thirdparty/doctest/doctest.h
similarity index 100%
rename from test/thirdparty/doctest/doctest.h
rename to tests/thirdparty/doctest/doctest.h
diff --git a/test/thirdparty/doctest/doctest_compatibility.h b/tests/thirdparty/doctest/doctest_compatibility.h
similarity index 100%
rename from test/thirdparty/doctest/doctest_compatibility.h
rename to tests/thirdparty/doctest/doctest_compatibility.h
diff --git a/test/thirdparty/fifo_map/LICENSE.MIT b/tests/thirdparty/fifo_map/LICENSE.MIT
similarity index 100%
rename from test/thirdparty/fifo_map/LICENSE.MIT
rename to tests/thirdparty/fifo_map/LICENSE.MIT
diff --git a/test/thirdparty/fifo_map/fifo_map.hpp b/tests/thirdparty/fifo_map/fifo_map.hpp
similarity index 100%
rename from test/thirdparty/fifo_map/fifo_map.hpp
rename to tests/thirdparty/fifo_map/fifo_map.hpp
diff --git a/test/thirdparty/imapdl/filterbr.py b/tests/thirdparty/imapdl/filterbr.py
similarity index 100%
rename from test/thirdparty/imapdl/filterbr.py
rename to tests/thirdparty/imapdl/filterbr.py
diff --git a/test/thirdparty/imapdl/gpl-3.0.txt b/tests/thirdparty/imapdl/gpl-3.0.txt
similarity index 100%
rename from test/thirdparty/imapdl/gpl-3.0.txt
rename to tests/thirdparty/imapdl/gpl-3.0.txt