diff --git a/src/d_main.c b/src/d_main.c
index bd63cd874..e3230d81e 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1203,7 +1203,11 @@ D_ConvertVersionNumbers (void)
 void D_SRB2Main(void)
 {
 	INT32 i, p;
-	INT32 pstartmap = 0;
+#ifdef DEVELOP
+	INT32 pstartmap = 1; // default to first loaded map (Test Run)
+#else
+	INT32 pstartmap = 0; // default to random map (0 is not a valid map number)
+#endif
 	boolean autostart = false;
 
 	/* break the version string into version numbers, for netplay */