diff --git a/Makefile b/Makefile
index 4447c730931f630b8547ca18a78dbf70bba4f4d9..e05f9b03a41667beb4a666d536797c11268829a1 100644
--- a/Makefile
+++ b/Makefile
@@ -305,7 +305,7 @@ run_tests_posix: posix_sitl_default
 	@mkdir -p build_posix_sitl_default/src/firmware/posix/rootfs/fs/microsd
 	@mkdir -p build_posix_sitl_default/src/firmware/posix/rootfs/eeprom
 	@touch build_posix_sitl_default/src/firmware/posix/rootfs/eeprom/parameters
-	@(cd build_posix_sitl_default/src/firmware/posix && ./mainapp -d ../../../../posix-configs/SITL/init/rcS_tests | tee test_output)
+	@(cd build_posix_sitl_default/src/firmware/posix && ./px4 -d ../../../../posix-configs/SITL/init/rcS_tests | tee test_output)
 	@(cd build_posix_sitl_default/src/firmware/posix && grep --color=always "All tests passed" test_output)
 
 tests: check_unittest run_tests_posix
diff --git a/src/modules/commander/commander_tests/state_machine_helper_test.cpp b/src/modules/commander/commander_tests/state_machine_helper_test.cpp
index 570f2b5886810d411fcb4c10bf30863803de37a1..27756ffea191892c9679d9d22d411540af6357e9 100644
--- a/src/modules/commander/commander_tests/state_machine_helper_test.cpp
+++ b/src/modules/commander/commander_tests/state_machine_helper_test.cpp
@@ -370,7 +370,7 @@ bool StateMachineHelperTest::mainStateTransitionTest(void)
 			commander_state_s::MAIN_STATE_AUTO_RTL, commander_state_s::MAIN_STATE_MANUAL, TRANSITION_CHANGED },
 
 		{ "transition: MANUAL to ALTCTL - not rotary",
-			MTT_ALL_NOT_VALID,
+			MTT_LOC_ALT_VALID,
 			commander_state_s::MAIN_STATE_MANUAL, commander_state_s::MAIN_STATE_ALTCTL, TRANSITION_CHANGED },
 
 		{ "transition: MANUAL to ALTCTL - rotary, global position not valid, local altitude valid",
@@ -423,6 +423,10 @@ bool StateMachineHelperTest::mainStateTransitionTest(void)
 			MTT_GLOBAL_POS_VALID,
 			commander_state_s::MAIN_STATE_MANUAL, commander_state_s::MAIN_STATE_AUTO_RTL, TRANSITION_DENIED },
 
+		{ "transition: MANUAL to ALTCTL - not rotary",
+			MTT_ALL_NOT_VALID,
+			commander_state_s::MAIN_STATE_MANUAL, commander_state_s::MAIN_STATE_ALTCTL, TRANSITION_DENIED },
+
 		{ "no transition: MANUAL to ALTCTL - rotary, global position not valid, local altitude not valid",
 			MTT_ROTARY_WING,
 			commander_state_s::MAIN_STATE_MANUAL, commander_state_s::MAIN_STATE_ALTCTL, TRANSITION_DENIED },