diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28be0b54c206..b7a2c3fedde0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,7 +389,7 @@ set_target_properties(test_results PROPERTIES EXCLUDE_FROM_ALL TRUE)
 # Integration testing using MAVSDK
 option(MAVSDK_TESTING "Integration testing using MAVSDK" OFF)
 if (MAVSDK_TESTING)
-	add_subdirectory(mavsdk_tests)
+	add_subdirectory(test/mavsdk_tests)
 endif()
 
 #=============================================================================
diff --git a/mavsdk_tests/.gitignore b/test/mavsdk_tests/.gitignore
similarity index 100%
rename from mavsdk_tests/.gitignore
rename to test/mavsdk_tests/.gitignore
diff --git a/mavsdk_tests/CMakeLists.txt b/test/mavsdk_tests/CMakeLists.txt
similarity index 100%
rename from mavsdk_tests/CMakeLists.txt
rename to test/mavsdk_tests/CMakeLists.txt
diff --git a/mavsdk_tests/autopilot_tester.cpp b/test/mavsdk_tests/autopilot_tester.cpp
similarity index 100%
rename from mavsdk_tests/autopilot_tester.cpp
rename to test/mavsdk_tests/autopilot_tester.cpp
diff --git a/mavsdk_tests/autopilot_tester.h b/test/mavsdk_tests/autopilot_tester.h
similarity index 100%
rename from mavsdk_tests/autopilot_tester.h
rename to test/mavsdk_tests/autopilot_tester.h
diff --git a/mavsdk_tests/catch2/catch.hpp b/test/mavsdk_tests/catch2/catch.hpp
similarity index 100%
rename from mavsdk_tests/catch2/catch.hpp
rename to test/mavsdk_tests/catch2/catch.hpp
diff --git a/mavsdk_tests/test_main.cpp b/test/mavsdk_tests/test_main.cpp
similarity index 100%
rename from mavsdk_tests/test_main.cpp
rename to test/mavsdk_tests/test_main.cpp
diff --git a/mavsdk_tests/test_mission_multicopter.cpp b/test/mavsdk_tests/test_mission_multicopter.cpp
similarity index 100%
rename from mavsdk_tests/test_mission_multicopter.cpp
rename to test/mavsdk_tests/test_mission_multicopter.cpp