diff --git a/src/systemcmds/tests/CMakeLists.txt b/src/systemcmds/tests/CMakeLists.txt
index 14964ee562..7acbbcec15 100644
--- a/src/systemcmds/tests/CMakeLists.txt
+++ b/src/systemcmds/tests/CMakeLists.txt
@@ -69,6 +69,7 @@ set(srcs
 	test_uart_send.c
 	test_versioning.cpp
 	test_smooth_z.cpp
+	test_controlmath.cpp
 	tests_main.c
 	)
 
diff --git a/src/systemcmds/tests/tests_main.c b/src/systemcmds/tests/tests_main.c
index 5e96e201a3..f8fcb5e070 100644
--- a/src/systemcmds/tests/tests_main.c
+++ b/src/systemcmds/tests/tests_main.c
@@ -96,7 +96,6 @@ const struct {
 #ifndef __PX4_NUTTX
 	{"mavlink",		mavlink_tests_main,	0},
 #endif
-	{"mc_pos_control",	mc_pos_control_tests_main,	0},
 	{"sf0x",		sf0x_tests_main,	0},
 	{"uorb",		uorb_tests_main,	0},
 	{"hysteresis",		test_hysteresis,	0},
diff --git a/src/systemcmds/tests/tests_main.h b/src/systemcmds/tests/tests_main.h
index a69fd201bf..3c5dd1a694 100644
--- a/src/systemcmds/tests/tests_main.h
+++ b/src/systemcmds/tests/tests_main.h
@@ -93,6 +93,7 @@ extern int	test_uart_send(int argc, char *argv[]);
 extern int	test_parameters(int argc, char *argv[]);
 extern int	test_versioning(int argc, char *argv[]);
 extern int  test_smooth_z(int argc, char *argv[]);
+extern int 	test_controlmath(int argc, char *argv[]);
 
 /* external */
 extern int commander_tests_main(int argc, char *argv[]);
@@ -101,8 +102,6 @@ extern int controllib_test_main(int argc, char *argv[]);
 extern int uorb_tests_main(int argc, char *argv[]);
 extern int rc_tests_main(int argc, char *argv[]);
 extern int sf0x_tests_main(int argc, char *argv[]);
-extern int mc_pos_control_tests_main(int argc, char *argv[]);
-extern int test_controlmath(int argc, char *argv[]);
 
 __END_DECLS