diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index fac8b476f..e14668bf2 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -445,6 +445,7 @@ consvar_t cv_kartdebugdirector = CVAR_INIT ("debugdirector", "Off", CV_CHEAT, CV
 consvar_t cv_spbtest = CVAR_INIT ("spbtest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
 consvar_t cv_gptest = CVAR_INIT ("gptest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
 consvar_t cv_debugrank = CVAR_INIT ("debugrank", "Off", CV_CHEAT, CV_OnOff, NULL);
+consvar_t cv_battletest = CVAR_INIT ("battletest", "Off", CV_CHEAT|CV_NETVAR, CV_OnOff, NULL);
 
 static CV_PossibleValue_t capsuletest_cons_t[] = {
 	{CV_CAPSULETEST_OFF, "Off"},
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 1a3bbda8b..5d8787544 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -96,6 +96,7 @@ extern consvar_t cv_kartdebugnodes, cv_kartdebugcolorize, cv_kartdebugdirector;
 extern consvar_t cv_spbtest, cv_gptest, cv_reducevfx;
 extern consvar_t cv_kartdebugwaypoints, cv_kartdebugbotpredict;
 extern consvar_t cv_debugrank;
+extern consvar_t cv_battletest;
 
 typedef enum {
 	CV_CAPSULETEST_OFF,
diff --git a/src/k_battle.c b/src/k_battle.c
index 31052cb6f..b82def8c1 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -771,7 +771,7 @@ void K_BattleInit(boolean singleplayercontext)
 {
 	size_t i;
 
-	if ((gametyperules & GTR_PRISONS) && singleplayercontext && !battleprisons)
+	if ((gametyperules & GTR_PRISONS) && singleplayercontext && !battleprisons && !cv_battletest.value)
 	{
 		mapthing_t *mt = mapthings;
 		for (i = 0; i < nummapthings; i++, mt++)
diff --git a/src/k_kart.c b/src/k_kart.c
index 6ab33fd3b..2836e06cc 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -351,6 +351,7 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_spbtest);
 	CV_RegisterVar(&cv_gptest);
 	CV_RegisterVar(&cv_capsuletest);
+	CV_RegisterVar(&cv_battletest);
 
 	CV_RegisterVar(&cv_reducevfx);
 }