diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index fe50e06..f72ab22 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -3681,9 +3681,9 @@
 
 	vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);
 	vc_conn.done;
-	f_shutdown_helper();
 
 	f_vty_amr_start_mode_restore(true);
+	f_shutdown_helper();
 }
 
 testcase TC_assignment_codec_amr_h() runs on test_CT {
@@ -3709,9 +3709,9 @@
 
 	vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);
 	vc_conn.done;
-	f_shutdown_helper();
 
 	f_vty_amr_start_mode_restore(false);
+	f_shutdown_helper();
 }
 
 /* 'amr start-mode auto' should not keep the (unused) 'smod' bits from previous configuration */
@@ -3743,11 +3743,11 @@
 
 	vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);
 	vc_conn.done;
-	f_shutdown_helper();
 
 	/* Clear the startmode bits to not affect subsequent tests, in case the bits should indeed stick around. */
 	f_vty_amr_start_mode_set(true, "1");
 	f_vty_amr_start_mode_restore(true);
+	f_shutdown_helper();
 }
 
 function f_TC_assignment_codec_amr(boolean fr, octetstring mrconf, bitstring s8_s0, bitstring exp_s8_s0,
@@ -4257,9 +4257,9 @@
 
 	vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);
 	vc_conn.done;
-	f_shutdown_helper();
 
 	f_vty_amr_start_mode_restore(false);
+	f_shutdown_helper();
 }
 
 /* test the procedure of the MSC requesting a Classmark Update: