In upstream git:
	0af8f786c0bae8c10d9b463d72e72cc6e80c26a2
	From: Marcus Meissner
and
	d2db083ab6f8491e806c72888d897d15584f9f17
	From: Lucas De Marchi

Index: kmod-19/testsuite/test-blacklist.c
===================================================================
--- kmod-19.orig/testsuite/test-blacklist.c
+++ kmod-19/testsuite/test-blacklist.c
@@ -92,14 +92,13 @@ fail_lookup:
 	kmod_unref(ctx);
 	return EXIT_FAILURE;
 }
-static const struct test sblacklist_1 = {
-	.name = "blacklist_1",
+
+DEFINE_TEST(blacklist_1,
 	.description = "check if modules are correctly blacklisted",
-	.func = blacklist_1,
 	.config = {
 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-blacklist/",
 	},
 	.need_spawn = true,
-};
+);
 
 TESTSUITE_MAIN();
Index: kmod-19/testsuite/test-dependencies.c
===================================================================
--- kmod-19.orig/testsuite/test-dependencies.c
+++ kmod-19/testsuite/test-dependencies.c
@@ -76,15 +76,13 @@ static int test_dependencies(const struc
 
 	return EXIT_SUCCESS;
 }
-static const struct test stest_dependencies = {
-	.name = "test_dependencies",
+DEFINE_TEST(test_dependencies,
 	.description = "test if kmod_module_get_dependencies works",
-	.func = test_dependencies,
 	.config = {
 		[TC_ROOTFS] = TESTSUITE_ROOTFS "test-dependencies/",
 		[TC_UNAME_R] = TEST_UNAME,
 	},
 	.need_spawn = true,
-};
+)
 
 TESTSUITE_MAIN();