diff --git a/tests/test_integration.c b/tests/test_integration.c
index 57f2897af3d70044814314ac1278de2c9f956faf..21d8201a0b5cf8547557600f4719d156fb6db42a 100644
--- a/tests/test_integration.c
+++ b/tests/test_integration.c
@@ -50,8 +50,9 @@ static PyObject* init(PyObject* self, PyObject* args)
 
 	/* Initialize resolution context */
 	#define CACHE_SIZE 100*1024
-	test_mm_ctx_init(&global_mm);
+	mm_ctx_init(&global_mm);
 	kr_context_init(&global_context, &global_mm);
+	kr_context_register(&global_context, "hints");
 	kr_context_register(&global_context, "iterate");
 	kr_context_register(&global_context, "itercache");
 	global_tmpdir = test_tmpdir_create();
diff --git a/tests/tests.mk b/tests/tests.mk
index 409f1a31ab2f9953e07bddf4443325dd1489a99e..299b5eed75484cfb10b691f15ebfa0e8f2abfbdd 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -40,10 +40,11 @@ _test_integration_DEPEND := libmock_calls
 $(eval $(call make_shared,_test_integration,tests))
 
 # Preload mock library
+insert_libs := tests/libmock_calls$(LIBEXT):modules/hints/hints$(LIBEXT)
 ifeq ($(PLATFORM),Darwin)
-	preload_libs := @DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=tests/libmock_calls$(LIBEXT)
+	preload_libs := @DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=$(insert_libs)
 else
-	preload_libs := @LD_PRELOAD=tests/libmock_calls$(LIBEXT)
+	preload_libs := @LD_PRELOAD=$(insert_libs)
 endif
 
 # Targets