diff --git a/.cirrus.yml b/.cirrus.yml
index 2b0fe93d31..670fe81f15 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -27,9 +27,12 @@ freebsd_task:
     ##tcc -v -v
     echo 'Build cmd/tools/fast'
     cd cmd/tools/fast && ../../../v fast.v ## && ./fast -clang
-  diagnose_math_script: |
-    echo 'Diagnose vlib/math/math_test.v'
-    ./v -stats vlib/math/math_test.v
+  test_math_script: |
+    echo 'Test the math module'
+    ./v test vlib/math
+  test_math_pure_v_script: |
+    echo 'Test the math module, using only the pure V versions, without the .c.v overrides'
+    ./v -exclude @vlib/math/*.c.v test vlib/math
   test_zip_modules_script: |
     echo 'Test modules using thirdparty/zip'
     ./v test vlib/compress/ vlib/szip/
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
index 80e397ab68..24830fc5fd 100644
--- a/.github/workflows/linux_ci.yml
+++ b/.github/workflows/linux_ci.yml
@@ -60,6 +60,8 @@ jobs:
           ./cmd/tools/test_if_v_test_system_works
       - name: All code is formatted
         run: ./v test-cleancode
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: ./v test-self
       # - name: Self tests (-cstrict)
@@ -212,6 +214,8 @@ jobs:
           ./cmd/tools/test_if_v_test_system_works
       - name: All code is formatted
         run: ./v test-cleancode
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: ./v test-self
       - name: Self tests (-prod)
@@ -315,6 +319,8 @@ jobs:
       - name: All code is formatted
         run: ./v test-cleancode
 
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: ./v test-self
       - name: Self tests (vprod)
diff --git a/.github/workflows/macos_ci.yml b/.github/workflows/macos_ci.yml
index 9327af0971..f22e9438a4 100644
--- a/.github/workflows/macos_ci.yml
+++ b/.github/workflows/macos_ci.yml
@@ -61,6 +61,8 @@ jobs:
           ./cmd/tools/test_if_v_test_system_works
       - name: All code is formatted
         run: VJOBS=1 ./v test-cleancode
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: VJOBS=1 ./v test-self
       - name: Build examples
diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
index d9651f8f06..171d53c4d2 100644
--- a/.github/workflows/windows_ci.yml
+++ b/.github/workflows/windows_ci.yml
@@ -46,6 +46,8 @@ jobs:
           ./cmd/tools/test_if_v_test_system_works
       - name: All code is formatted
         run: ./v test-cleancode
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: .\v.exe test-self
         #    - name: Test
@@ -111,6 +113,8 @@ jobs:
 ### TODO: test-cleancode fails with msvc. Investigate why???
 ##      - name: All code is formatted
 ##        run: ./v test-cleancode
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: |
           ./v -cg cmd\tools\vtest-self.v
@@ -166,6 +170,8 @@ jobs:
         run: ./v -W build-tools
       - name: All code is formatted
         run: ./v test-cleancode
+      - name: Test pure V math module
+        run: ./v -exclude @vlib/math/*.c.v test vlib/math/
       - name: Self tests
         run: ./v test-self
       - name: Test v->js