diff --git a/test/run-test.c b/test/run-test.c
index 0663e0b..108d1f2 100644
--- a/test/run-test.c
+++ b/test/run-test.c
@@ -31,7 +31,7 @@
 static void test_pass(TestState *);
 static void test_fail(TestState *);
 static void test_pend(TestState *);
-static void null_state(TestState *);
+decl_test(null_state);
 static void null_test(TestState *);
 decl_test(always_passes);
 decl_test(always_fails);
@@ -46,7 +46,7 @@ test_run_test(TestState *s)
 	test_pass(s);
 	test_fail(s);
 	test_pend(s);
-	null_state(s);
+	run_test(s, null_state);
 	null_test(s);
 }
 
@@ -130,13 +130,11 @@ test_pend(TestState *s)
 	);
 }
 
-static void
-null_state(TestState *)
+decl_test(null_state)
 {
 	print("\tnull state\n");
-
-	// make sure it doesn't crash
 	run_test(0, always_passes);
+	return test_success;
 }
 
 static void