diff --git a/.github/workflows/win_clang_dbg_x64.yaml b/.github/workflows/win_clang_dbg_x64.yaml
index 0e4cf6bd7..825cadc16 100644
--- a/.github/workflows/win_clang_dbg_x64.yaml
+++ b/.github/workflows/win_clang_dbg_x64.yaml
@@ -61,11 +61,17 @@ jobs:
         cd base
         ninja -C out\Debug
 
+    - name: Run gpgmm_end2end_tests leak tests
+      shell: cmd
+      run: |
+        cd base
+        out\Debug\gpgmm_end2end_tests.exe --gtest_filter=*NoLeak
+
     - name: Run gpgmm_end2end_tests
       shell: cmd
       run: |
         cd base
-        out\Debug\gpgmm_end2end_tests.exe --gtest_output=json:${{ github.workspace }}\..\baseline_end2end_tests.json 2>&1
+        out\Debug\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak --gtest_output=json:${{ github.workspace }}\..\baseline_end2end_tests.json 2>&1
 
     - name: Run gpgmm_unittests
       shell: cmd
@@ -129,7 +135,7 @@ jobs:
       shell: cmd
       run: |
         cd test
-        out\Debug\gpgmm_end2end_tests.exe --gtest_output=json:${{ github.workspace }}\..\test_end2end_tests.json 2>&1
+        out\Debug\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak --gtest_output=json:${{ github.workspace }}\..\test_end2end_tests.json 2>&1
 
     - name: Run gpgmm_unittests (with patch)
       shell: cmd
diff --git a/.github/workflows/win_clang_rel_x64.yaml b/.github/workflows/win_clang_rel_x64.yaml
index c54dc5af4..b1db8c11e 100644
--- a/.github/workflows/win_clang_rel_x64.yaml
+++ b/.github/workflows/win_clang_rel_x64.yaml
@@ -61,11 +61,17 @@ jobs:
         cd base
         ninja -C out\Release
 
+    - name: Run gpgmm_end2end_tests leak tests
+      shell: cmd
+      run: |
+        cd base
+        out\Release\gpgmm_end2end_tests.exe --gtest_filter=*NoLeak
+
     - name: Run gpgmm_end2end_tests
       shell: cmd
       run: |
         cd base
-        out\Release\gpgmm_end2end_tests.exe --gtest_output=json:${{ github.workspace }}\..\baseline_end2end_tests.json
+        out\Release\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak --gtest_output=json:${{ github.workspace }}\..\baseline_end2end_tests.json
 
     - name: Run gpgmm_unittests
       shell: cmd
@@ -129,7 +135,7 @@ jobs:
       shell: cmd
       run: |
         cd test
-        out\Release\gpgmm_end2end_tests.exe --gtest_output=json:${{ github.workspace }}\..\test_end2end_tests.json || true
+        out\Release\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak --gtest_output=json:${{ github.workspace }}\..\test_end2end_tests.json || true
 
     - name: Run gpgmm_unittests (with patch)
       shell: cmd
diff --git a/.github/workflows/win_msvc_dbg_x64.yaml b/.github/workflows/win_msvc_dbg_x64.yaml
index 0019a2493..27d0752c7 100644
--- a/.github/workflows/win_msvc_dbg_x64.yaml
+++ b/.github/workflows/win_msvc_dbg_x64.yaml
@@ -76,11 +76,17 @@ jobs:
         cd test
         ninja -C out\Debug
 
+    - name: Run gpgmm_end2end_tests leak tests (with patch)
+      shell: cmd
+      run: |
+        cd test
+        out\Debug\gpgmm_end2end_tests.exe --gtest_filter=*NoLeak 2>&1
+
     - name: Run gpgmm_end2end_tests (with patch)
       shell: cmd
       run: |
         cd test
-        out\Debug\gpgmm_end2end_tests.exe 2>&1
+        out\Debug\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak 2>&1
 
     - name: Run gpgmm_unittests (with patch)
       shell: cmd
diff --git a/.github/workflows/win_msvc_dbg_x64_cmake.yaml b/.github/workflows/win_msvc_dbg_x64_cmake.yaml
index e314d6274..58e13f64c 100644
--- a/.github/workflows/win_msvc_dbg_x64_cmake.yaml
+++ b/.github/workflows/win_msvc_dbg_x64_cmake.yaml
@@ -72,11 +72,17 @@ jobs:
         cd test
         cmake --build . --config Debug
 
+    - name: Run gpgmm_end2end_tests leak tests (with patch)
+      shell: cmd
+      run: |
+        cd test
+        bin\Debug\gpgmm_end2end_tests.exe --gtest_filter=*NoLeak 2>&1
+
     - name: Run gpgmm_end2end_tests (with patch)
       shell: cmd
       run: |
         cd test
-        bin\Debug\gpgmm_end2end_tests.exe 2>&1
+        bin\Debug\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak 2>&1
 
     - name: Run gpgmm_unittests (with patch)
       shell: cmd
diff --git a/.github/workflows/win_msvc_rel_x64.yaml b/.github/workflows/win_msvc_rel_x64.yaml
index 85f9db7e7..ce4312cf8 100644
--- a/.github/workflows/win_msvc_rel_x64.yaml
+++ b/.github/workflows/win_msvc_rel_x64.yaml
@@ -76,19 +76,25 @@ jobs:
         cd test
         ninja -C out\Release
 
-    - name: Run gpgmm_end2end_tests
+    - name: Run gpgmm_end2end_tests leak tests (with patch)
       shell: cmd
       run: |
         cd test
-        out\Release\gpgmm_end2end_tests.exe --check-device-leaks
+        out\Release\gpgmm_end2end_tests.exe --gtest_filter=*NoLeak --check-device-leaks
 
-    - name: Run gpgmm_unittests
+    - name: Run gpgmm_end2end_tests (with patch)
+      shell: cmd
+      run: |
+        cd test
+        out\Release\gpgmm_end2end_tests.exe --gtest_filter=-*NoLeak --check-device-leaks
+
+    - name: Run gpgmm_unittests (with patch)
       shell: cmd
       run: |
         cd test
         out\Release\gpgmm_unittests.exe
 
-    - name: Run gpgmm_capture_replay_tests
+    - name: Run gpgmm_capture_replay_tests (with patch)
       shell: cmd
       run: |
         cd test