diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 468496f..e07936a 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -14,10 +14,13 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Install valgrind
+      run: apt install valgrind
+
     # Run configure with high verbosity and valgrind on xconfig
     - name: configure
       run: |
         mkdir build
         cd build
-        ../configure --cripple-atlas-performance -v 2
+        ../configure --cripple-atlas-performance -v 2 --valgrind
     
diff --git a/configure b/configure
index e8407bf..f474861 100755
--- a/configure
+++ b/configure
@@ -74,6 +74,7 @@ rdbitwidth=0
 dylib=0
 accel=0  # 1: TI_C66_BM, 2: Xeon Phi
 irtarg=0
+valgrind=
 rtarg=
 for arg in "$@"
 do
@@ -203,6 +204,12 @@ do
       pass="$pass -Si cripple-perf 1"
       handled=1
    fi
+   flag=`echo "$arg" | sed -e "s/--valgrind//"`
+   if test "$flag" != "$arg"
+   then
+      valgrind=valgrind
+      handled=1
+   fi
    flag=`echo "$arg" | sed -e "s/--force-tids=//"`
    if test "$flag" != "$arg"
    then
@@ -482,13 +489,13 @@ cp "$path"/CONFIG/src/atlcomp.txt .
 # Build and run xconfig
 #
 make -f Makefile xconfig
-echo ./xconfig -d s "$topdir" -d b "$blddir" "$pass"
+echo $valgrind ./xconfig -d s "$topdir" -d b "$blddir" "$pass"
 #./xconfig -d s "$topdir" -d b "$blddir" `echo "$pass"`
 if test $fulllapack -eq 0
 then
-   echo ./xconfig -d s "$topdir" -d b "$blddir" "$pass" | /bin/sh
+   echo $valgrind ./xconfig -d s "$topdir" -d b "$blddir" "$pass" | /bin/sh
 else
-   echo ./xconfig -d s "$topdir" -d b "$blddir" "$pass" \
+   echo $valgrind ./xconfig -d s "$topdir" -d b "$blddir" "$pass" \
         -D c -DATL_FULL_LAPACK | /bin/sh
 fi
 ierr=$?