diff --git a/src/command.cpp b/src/command.cpp
index 1c890e19d6..76608bc8c2 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1156,7 +1156,7 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint64 p3,
 	Backup<CompanyID> cur_company(_current_company, FILE_LINE);
 	if (exec_as_spectator) cur_company.Change(COMPANY_SPECTATOR);
 
-	bool test_and_exec_can_differ = (cmd_flags & CMD_NO_TEST) != 0;
+	bool test_and_exec_can_differ = ((cmd_flags & CMD_NO_TEST) != 0) || HasChickenBit(DCBF_CMD_NO_TEST_ALL);
 
 	GameRandomSeedChecker random_state;
 
diff --git a/src/debug_settings.h b/src/debug_settings.h
index 576086bcf2..dcc4515ba9 100644
--- a/src/debug_settings.h
+++ b/src/debug_settings.h
@@ -20,6 +20,7 @@ enum ChickenBitFlags {
 	DCBF_DESYNC_CHECK_POST_COMMAND     = 3,
 	DCBF_DESYNC_CHECK_NO_GENERAL       = 4,
 	DCBF_DESYNC_CHECK_PERIODIC_SIGNALS = 5,
+	DCBF_CMD_NO_TEST_ALL               = 6,
 };
 
 inline bool HasChickenBit(ChickenBitFlags flag)