diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml
index b26a9a6d..f613ca46 100644
--- a/.github/workflows/c.yml
+++ b/.github/workflows/c.yml
@@ -73,14 +73,14 @@ jobs:
 
     - name: Run tests (ubuntu-latest)
       if: ${{ matrix.os == 'ubuntu-latest' }}
-      run: make c_test COV=true COMPILER_OVERRIDE=${{ matrix.compiler }}
-
-    - name: Setup upterm session
-      uses: lhotari/action-upterm@v1
-      if: ${{ matrix.os == 'ubuntu-latest' }}
-      with:
-        ## limits ssh access and adds the ssh public key for the user which triggered the workflow
-        limit-access-to-actor: true
+      run: make c_test COV=true COMPILER_OVERRIDE=${{ matrix.compiler }} NO_CLEANUP=true
+
+    # - name: Setup upterm session
+    #   uses: lhotari/action-upterm@v1
+    #   if: ${{ matrix.os == 'ubuntu-latest' }}
+    #   with:
+    #     ## limits ssh access and adds the ssh public key for the user which triggered the workflow
+    #     limit-access-to-actor: true
 
     - name: Run tests (ubuntu lts)
       if: ${{ contains(matrix.os, 'ubuntu') && matrix.os != 'ubuntu-latest' }}
diff --git a/c/test_euler.py b/c/test_euler.py
index 2c1df7dc..d14923bb 100644
--- a/c/test_euler.py
+++ b/c/test_euler.py
@@ -161,8 +161,8 @@
 GCC_TEMPLATE = "{} {{}} -O2 -lm -Wall -Werror -std={} -march=native -flto -fwhole-program -o {{}}"
 CLANG_TEMPLATE = "{} {{}} -O2 {} {} -Wall -Werror -std={} {} -o {{}}"
 if environ.get('COV') == 'true':
-    GCC_TEMPLATE += ' -ftest-coverage -fprofile-arcs'
-    CLANG_TEMPLATE = CLANG_TEMPLATE.replace('-O2', '-O1') + ' -ftest-coverage'
+    GCC_TEMPLATE = GCC_TEMPLATE.replace('-O2', '-O1') + ' --coverage'
+    CLANG_TEMPLATE = CLANG_TEMPLATE.replace('-O2', '-O1') + ' --coverage -femit-coverage-data -femit-coverage-notes'
 
 templates = {
     'TCC': "tcc -lm -Wall -Werror -o {1} {0}",
@@ -181,7 +181,7 @@
 
 @register
 def cleanup():
-    if 'PYTEST_XDIST_WORKER' not in environ:
+    if 'PYTEST_XDIST_WORKER' not in environ and environ.get('NO_CLEANUP', 'false') != 'true':
         rmtree(BUILD_FOLDER)