diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index a3131e3c..62e00cc5 100644
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Marc Olzheim, 2004
- *     Markus Armbruster, 2004-2013
+ *     Markus Armbruster, 2004-2014
  */
 
 /*
@@ -395,6 +395,8 @@ EMPCFBOTH("news_keep_days", news_keep_days, int, NSC_INT, KM_INTERNAL,
     "How long until news expire")
 EMPCFBOTH("lost_keep_hours", lost_keep_hours, int, NSC_INT, KM_INTERNAL,
     "How long until lost items expire")
+EMPCFBOTH("running_test_suite", running_test_suite, int, NSC_INT, KM_INTERNAL,
+    "Are we running the test suite?  Must be 0 for games!")
 
 /* Sentinel */
 EMPCFONLYC(NULL, emp_config_dummy, NULL, NSC_NOTYPE, 0, NULL)
diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c
index b518cccf..2eedcf59 100644
--- a/src/lib/global/constants.c
+++ b/src/lib/global/constants.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1996
- *     Markus Armbruster, 2004-2013
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -47,6 +47,8 @@ char *post_crash_dump_hook = "";
 
 char *disabled_commands = "";
 
+int running_test_suite = 0;	/* For use by "make check" only */
+
 int keep_journal = 0;		/* journal log file enabled */
 
 int WORLD_X = 64;		/* World size - x */
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 97018006..6181a2e4 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2014
  *     Ron Koenderink, 2004-2009
  */
 
@@ -60,6 +60,10 @@ player_main(struct player *p)
     time(&player->curup);
     update_timeused_login(player->curup);
     show_motd();
+    if (running_test_suite)
+	pr("\n"
+	   "***          Server configured for testing          ***\n"
+	   "*** If you see this in a game, it is misconfigured! ***\n");
     if (init_nats() < 0) {
 	pr("Server confused, try again later\n");
 	return;
diff --git a/src/server/main.c b/src/server/main.c
index be80ca2e..9c27f2d6 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -31,7 +31,7 @@
  *     Steve McClure, 1996, 1998
  *     Doug Hay, 1998
  *     Ron Koenderink, 2004-2009
- *     Markus Armbruster, 2005-2013
+ *     Markus Armbruster, 2005-2014
  */
 
 #include <config.h>
@@ -381,6 +381,8 @@ start_server(int flags)
     create_pidfile(pidfname, pid);
     logerror("------------------------------------------------------");
     logerror("Empire server (pid %d) started", (int)pid);
+    if (running_test_suite)
+	logerror("Configured for testing");
 
     empth_init((void **)&player, flags);