diff --git a/cmake/mimalloc-config.cmake b/cmake/mimalloc-config.cmake
index 024c97d9..9b0a56d7 100644
--- a/cmake/mimalloc-config.cmake
+++ b/cmake/mimalloc-config.cmake
@@ -4,8 +4,8 @@ if (MIMALLOC_SHARE_DIR MATCHES "/share/")
   string(REPLACE "/share/" "/lib/"     MIMALLOC_LIBRARY_DIR ${MIMALLOC_SHARE_DIR})
   string(REPLACE "/share/" "/include/" MIMALLOC_INCLUDE_DIR ${MIMALLOC_SHARE_DIR})
 else()
-  # if MI_INSTALL_TOPLEVEL==ON
-  set(MIMALLOC_LIBRARY_DIR "${MIMALLOC_SHARE_DIR}/lib")      
-  set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_SHARE_DIR}/include")  
+  # installed with -DMI_INSTALL_TOPLEVEL=ON
+  string(REPLACE "/lib/cmake" "/lib"     MIMALLOC_LIBRARY_DIR "${MIMALLOC_SHARE_DIR}")  
+  string(REPLACE "/lib/cmake" "/include" MIMALLOC_INCLUDE_DIR "${MIMALLOC_SHARE_DIR}")  
 endif()  
 set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") # legacy
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7986d2da..13bf32de 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.0)
 project(mimalloc-test C CXX)
 
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
+
 # Set default build type
 if (NOT CMAKE_BUILD_TYPE)
   if ("${CMAKE_BINARY_DIR}" MATCHES ".*(D|d)ebug$")