diff --git a/.github/workflows/pmem_test_matrix.yml b/.github/workflows/pmem_test_matrix.yml
index e0965aaceac..4b62b0c6788 100644
--- a/.github/workflows/pmem_test_matrix.yml
+++ b/.github/workflows/pmem_test_matrix.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Test prepare
         uses: ./.github/actions/pmem_test_prepare
         with:
-          valgrind: ${{ fromJSON(inputs.valgrind) }}
+          valgrind: ${{ inputs.valgrind }}
 
       - name: Test run
         uses: ./.github/actions/pmem_test_run
diff --git a/.github/workflows/pmem_tests.yml b/.github/workflows/pmem_tests.yml
index 290677cc21b..7f86198483c 100644
--- a/.github/workflows/pmem_tests.yml
+++ b/.github/workflows/pmem_tests.yml
@@ -39,6 +39,7 @@ jobs:
       # 9h = 7h20m (the longest workflow execution time) + ~20% leeway.
       timeout_minutes: 540
 
+
   # Static builds are tested in this limited scope only.
   static:
     name: Static
@@ -109,3 +110,12 @@ jobs:
         uses: ./.github/actions/pmem_test_run
         with:
           build: nondebug # only the production build is considered
+
+
+  # Test the default build with the basic test suite.
+  Basic_w_Valgrind:
+    uses: ./.github/workflows/pmem_test_matrix.yml
+    with:
+      # Exclude all Valgrind tests but keep Valgrind tools built-in.
+      force_enable: '["none"]'
+      valgrind: 1
diff --git a/src/test/valgrind_check/valgrind_check.c b/src/test/valgrind_check/valgrind_check.c
index b719be9a0b1..6196110249b 100644
--- a/src/test/valgrind_check/valgrind_check.c
+++ b/src/test/valgrind_check/valgrind_check.c
@@ -7,7 +7,6 @@
  * usage: valgrind_check
  *
  */
-
 #include "valgrind_internal.h"
 
 #ifndef VALGRIND_ENABLED