diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 192b0dcf..1ce023c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,7 +35,10 @@ jobs:
       with:
         channels: conda-forge
         environment-file: "scripts/ci/environment.yml"
-        environment-name: "entwine-build"
+        mamba-version: "*"
+        channels: conda-forge,defaults
+        activate-environment: "entwine-build"
+        channel-priority: true
 
 
     - name: CMake
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4339b857..6af1d517 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -21,8 +21,9 @@ macro(ENTWINE_ADD_TEST _name)
     add_test(NAME ${_name} COMMAND ${test-name})
 
     if (WIN32)
-        set_property(TEST ${_name} PROPERTY ENVIRONMENT
-             "PATH=$<SHELL_PATH:${CMAKE_BINARY_DIR}/bin>;$ENV{PATH}")
+        set_property(TEST ${_name} PROPERTY
+            ENVIRONMENT_MODIFICATION
+            PATH=path_list_append:$<TARGET_RUNTIME_DLL_DIRS:gtest_main>)
     endif()
 
 endmacro(ENTWINE_ADD_TEST)