diff --git a/girepository/girepository.c b/girepository/girepository.c
index a6a81716d..eefe52928 100644
--- a/girepository/girepository.c
+++ b/girepository/girepository.c
@@ -140,8 +140,6 @@ G_DEFINE_TYPE (GIRepository, gi_repository, G_TYPE_OBJECT);
 
 static HMODULE girepository_dll = NULL;
 
-#ifdef DLL_EXPORT
-
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 
 BOOL WINAPI
@@ -155,7 +153,6 @@ DllMain (HINSTANCE hinstDLL,
   return TRUE;
 }
 
-#endif /* DLL_EXPORT */
 #endif /* G_PLATFORM_WIN32 */
 
 #ifdef __APPLE__
diff --git a/girepository/tests/repository-search-paths.c b/girepository/tests/repository-search-paths.c
index cef32368c..a80fc8bf0 100644
--- a/girepository/tests/repository-search-paths.c
+++ b/girepository/tests/repository-search-paths.c
@@ -27,7 +27,7 @@ test_repository_search_paths_get_expected_libdir_path (void)
 {
 #if defined(G_PLATFORM_WIN32)
   const char *tests_build_dir = g_getenv ("G_TEST_BUILDDIR");
-  char *expected_rel_path = g_build_filename (tests_build_dir, "lib", "girepository-1.0", NULL);
+  char *expected_rel_path = g_build_filename (tests_build_dir, "..", "lib", "girepository-1.0", NULL);
 #elif defined(__APPLE__)
   const char *tests_build_dir = g_getenv ("G_TEST_BUILDDIR");
   char *expected_rel_path = g_build_filename (tests_build_dir, "..", "girepository-1.0", NULL);