diff --git a/src/f_finale.c b/src/f_finale.c
index 37a50cb3a..af0ab00dc 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2179,6 +2179,10 @@ void F_TitleScreenTicker(boolean run)
 	if (!cv_rollingdemos.value)
 		return;
 
+	#if defined (TESTERS)
+		return;
+	#endif
+
 	// Wait for a while (for the music to finish, preferably)
 	// before starting demos
 	if (demoDelayLeft)
diff --git a/src/menus/play-char-select.c b/src/menus/play-char-select.c
index 0fd67dc45..1e356013d 100644
--- a/src/menus/play-char-select.c
+++ b/src/menus/play-char-select.c
@@ -1460,7 +1460,12 @@ void M_CharacterSelectTick(void)
 					CV_StealthSetValue(&cv_usejoystick[0], setup_player[0].ponedevice);
 				}
 
-				M_SetupNextMenu(&PLAY_MainDef, false);
+				#if defined (TESTERS)
+					M_MPOptSelectInit(0);
+				#else
+					M_SetupNextMenu(&PLAY_MainDef, false);
+				#endif
+				
 			}
 		}
 		else	// In a game
diff --git a/src/menus/play-online-1.c b/src/menus/play-online-1.c
index 177cc3dfc..e48154648 100644
--- a/src/menus/play-online-1.c
+++ b/src/menus/play-online-1.c
@@ -3,22 +3,34 @@
 
 #include "../k_menu.h"
 
+#if defined (TESTERS)
+	#define IT_STRING_CALL_NOTESTERS IT_DISABLED
+#else
+	#define IT_STRING_CALL_NOTESTERS (IT_STRING | IT_CALL)
+#endif // TESTERS
+
 menuitem_t PLAY_MP_OptSelect[] =
 {
-	//{IT_NOTHING | IT_KEYHANDLER, NULL, NULL, NULL, M_MPOptSelect, 0, 0},
-	{IT_STRING | IT_CALL, "Host Game", "Start your own online game!",
+	{IT_STRING_CALL_NOTESTERS, "Host Game", "Start your own online game!",
 		NULL, {.routine = M_MPHostInit}, 0, 0},
 
-	{IT_STRING | IT_CALL, "Server Browser", "Search for game servers to play in.",
+	{IT_STRING_CALL_NOTESTERS, "Server Browser", "Search for game servers to play in.",
 		NULL, {.routine = M_MPRoomSelectInit}, 0, 0},
 
 	{IT_STRING | IT_CALL, "Join by IP", "Join an online game by its IP address.",
 		NULL, {.routine = M_MPJoinIPInit}, 0, 0},
 };
 
+#undef IT_STRING_CALL_NOTESTERS
+
+
 menu_t PLAY_MP_OptSelectDef = {
 	sizeof (PLAY_MP_OptSelect) / sizeof (menuitem_t),
-	&PLAY_MainDef,
+	#if defined (TESTERS)
+		&PLAY_CharSelectDef,
+	#else
+		&PLAY_MainDef,
+	#endif
 	0,
 	PLAY_MP_OptSelect,
 	0, 0,