diff --git a/include/test/test.h b/include/test/test.h
index 96bdef04..d68b7f0 100644
--- a/include/test/test.h
+++ b/include/test/test.h
@@ -145,6 +145,11 @@
 	void (*exit)(struct test_initcall *this);
 };
 
+struct test_post_condition {
+	struct list_head node;
+	void (*validate)(struct test_post_condition *condition);
+};
+
 /**
  * struct test - represents a running instance of a test.
  * @priv: for user to store arbitrary data. Commonly used to pass data created
@@ -159,6 +164,7 @@
 	void *priv;
 	/* private: internal use only. */
 	struct list_head resources;
+	struct list_head post_conditions;
 	const char *name;
 	bool death_test;
 	bool success;
diff --git a/test/test.c b/test/test.c
index 1c077e9..c471c378 100644
--- a/test/test.c
+++ b/test/test.c
@@ -76,6 +76,7 @@
 int test_init_test(struct test *test, const char *name)
 {
 	INIT_LIST_HEAD(&test->resources);
+	INIT_LIST_HEAD(&test->post_conditions);
 	test->name = name;
 	test->vprintk = test_vprintk;
 	test->fail = test_fail;
@@ -134,6 +135,16 @@
 				  struct test_module *module,
 				  struct test_case *test_case)
 {
+	struct test_post_condition *condition, *condition_safe;
+
+	list_for_each_entry_safe(condition,
+				 condition_safe,
+				 &test->post_conditions,
+				 node) {
+		condition->validate(condition);
+		list_del(&condition->node);
+	}
+
 	if (module->exit)
 		module->exit(test);