diff --git a/include/kunit/test.h b/include/kunit/test.h
index 58217d4..b3119e2 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -43,7 +43,15 @@
 #define KUNIT_ASSERT_SIGSEGV ASSERT_SIGSEGV
 
 #define KUNIT_CASE TEST_CASE
-#define kunit_test_suites module_test
+#define kunit_test_suite module_test
+
+// NOTE: in upstream, this can handle multiple suites. We can't here.
+#define ___concat(a,b) a##b
+#define __concat(a,b) ___concat(a,b)
+#define kunit_test_suites(suite_ptr) \
+		static struct KUNIT_SUITE_T *__concat(__test_module_,__COUNTER__) __used \
+		__aligned(8) __attribute__((__section__(".test_modules"))) = \
+			suite_ptr
 
 #define kunit_info test_info
 #define kunit_warn test_warn
diff --git a/test/test-test.c b/test/test-test.c
index 9839c75..c1bdfe9 100644
--- a/test/test-test.c
+++ b/test/test-test.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2018, Google LLC.
  * Author: Brendan Higgins <brendanhiggins@google.com>
  */
-#include <test/test.h>
+#include <kunit/test.h>
 
 typedef void (*test_resource_free_t)(struct KUNIT_RESOURCE_T *);
 
@@ -128,4 +128,4 @@
 	.exit = test_test_exit,
 	.test_cases = test_test_cases,
 };
-module_test(test_test_module);
+kunit_test_suites(&test_test_module);