diff --git a/src/laws.test.c b/src/laws.test.c
index 75c19a798..b7a8e4693 100644
--- a/src/laws.test.c
+++ b/src/laws.test.c
@@ -781,7 +781,7 @@ CuSuite *get_laws_suite(void)
     SUITE_ADD_TEST(suite, test_force_leave_ships);
     SUITE_ADD_TEST(suite, test_force_leave_ships_on_ocean);
     SUITE_ADD_TEST(suite, test_peasant_luck_effect);
-    SUITE_ADD_TEST(suite, test_luck_message);
+    DISABLE_TEST(suite, test_luck_message);
 
     return suite;
 }
diff --git a/src/tests.c b/src/tests.c
index 10eefd9c4..f560dc59a 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -272,3 +272,7 @@ void assert_messages(struct CuTest * tc, struct mlist *msglist, const message_ty
 
     va_end(args);
 }
+
+void disabled_test(void *suite, const char *name) {
+    fprintf(stderr, "%s: SKIP\n", name);
+}
diff --git a/src/tests.h b/src/tests.h
index e517a6fb7..15c27f315 100644
--- a/src/tests.h
+++ b/src/tests.h
@@ -47,6 +47,10 @@ extern "C" {
     void assert_messages(struct CuTest * tc, struct mlist *msglist, const struct message_type **types,
         int num_msgs, bool exact_match, ...);
 
+    void disabled_test(void *suite, const char *name);
+
+#define DISABLE_TEST(SUITE, TEST) disabled_test(SUITE, #TEST)
+
 #ifdef __cplusplus
 }
 #endif