diff --git a/.github/workflows/pmem_check.yml b/.github/workflows/pmem_check.yml
index b44595a1341..84e6a898b7f 100644
--- a/.github/workflows/pmem_check.yml
+++ b/.github/workflows/pmem_check.yml
@@ -14,14 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [[self-hosted, rhel],[self-hosted, opensuse]]
-        config: ['check TEST_BUILD=debug',
-                 'check TEST_BUILD=nondebug',
-                 'check TEST_BUILD=static_debug',
-                 'check TEST_BUILD=static_nondebug',
-                 'pycheck TEST_BUILD=debug',
-                 'pycheck TEST_BUILD=nondebug',
-                 'pycheck TEST_BUILD=static_debug',
-                 'pycheck TEST_BUILD=static_nondebug']
+        config: ['debug', 'nondebug', 'static_debug', 'static_nondebug']
     env:
       WORKDIR: utils/gha-runners
 
@@ -38,5 +31,8 @@ jobs:
       - name: Create testconfig files
         run: ./$WORKDIR/create-testconfig.sh
 
-      - name: Run tests
-        run: make ${{ matrix.config }}
+      - name: Run tests check
+        run: make check TEST_BUILD=${{ matrix.config }}
+
+      - name: Run tests pycheck
+        run: make pycheck TEST_BUILD=${{ matrix.config }}
diff --git a/.github/workflows/pmem_valgrind_py.yml b/.github/workflows/pmem_valgrind.yml
similarity index 78%
rename from .github/workflows/pmem_valgrind_py.yml
rename to .github/workflows/pmem_valgrind.yml
index b11211b9c77..87ddb6d6183 100644
--- a/.github/workflows/pmem_valgrind_py.yml
+++ b/.github/workflows/pmem_valgrind.yml
@@ -1,7 +1,7 @@
-# Run all tests (in python test framework) with 'force-enabled' valgrind.
+# Run all tests with 'force-enabled' valgrind.
 #
 # This workflow is run on 'self-hosted' runners.
-name: PMEM Valgrind python
+name: PMEM Valgrind 
 
 on:
   workflow_dispatch:
@@ -10,13 +10,14 @@ on:
 
 jobs:
   linux:
-    name: PMEM_valgrind_py
+    name: PMEM_valgrind
     if: github.repository == 'pmem/pmdk'
     runs-on: ${{ matrix.os }}
     timeout-minutes: 4320 # wait max 3 days
     strategy:
       fail-fast: false
       matrix:
+        script: ['sh', 'py']
         config: ['drd', 'pmemcheck', 'memcheck', 'helgrind']
         build: ['debug', 'nondebug', 'static_debug', 'static_nondebug']
         os: [[self-hosted, rhel],[self-hosted, opensuse]]
@@ -38,4 +39,4 @@ jobs:
         run: ./$WORKDIR/create-testconfig.sh
 
       - name: Run tests
-        run: cd src/test/ && ./RUNTESTS.py --force-enable ${{ matrix.config }} -b ${{ matrix.build }}
+        run: cd src/test/ && ./RUNTESTS.${{ matrix.script }} --force-enable ${{ matrix.config }} -b ${{ matrix.build }}
diff --git a/.github/workflows/pmem_valgrind_sh.yml b/.github/workflows/pmem_valgrind_sh.yml
deleted file mode 100644
index dee1f824752..00000000000
--- a/.github/workflows/pmem_valgrind_sh.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Run all tests (in bash test framework) with 'force-enabled' valgrind.
-#
-# This workflow is run on 'self-hosted' runners.
-name: PMEM Valgrind bash
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron:  '0 18 * * 5'    # At 18:00 on Friday.
-
-jobs:
-  linux:
-    name: PMEM_valgrind_sh
-    if: github.repository == 'pmem/pmdk'
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 4320 # wait max 3 days
-    strategy:
-      fail-fast: false
-      matrix:
-        config: ['drd', 'pmemcheck', 'memcheck', 'helgrind']
-        build: ['debug', 'nondebug', 'static_debug', 'static_nondebug']
-        os: [[self-hosted, rhel],[self-hosted, opensuse]]
-
-    env:
-      WORKDIR: utils/gha-runners
-
-    steps:
-      - name: Clone the git repo
-        uses: actions/checkout@v3
-
-      - name: Get system information
-        run: ./$WORKDIR/get-system-info.sh
-
-      - name: Build
-        run: ./$WORKDIR/build-pmdk.sh
-
-      - name: Create testconfig file
-        run: ./$WORKDIR/create-testconfig.sh
-
-      - name: Run tests
-        run: cd src/test/ && ./RUNTESTS.sh --force-enable ${{ matrix.config }} -b ${{ matrix.build }}