diff --git a/tools/git-regtest b/tools/git-regtest
index a71bc52..0f5737a 100755
--- a/tools/git-regtest
+++ b/tools/git-regtest
@@ -42,7 +42,7 @@ PARENTS=$(git log --oneline --ancestry-path \
 let PARENTS1=${PARENTS}+1
 echo "${PARENTS1} commits to go."
 
-trap "echo -n \"Current commit is \"
+trap "echo -n \"Current commit is\"
       git log HEAD^..HEAD | head -5 | tail -1" 0
 
 while [ ${PARENTS} -ge 0 ]; do
@@ -58,7 +58,10 @@ while [ ${PARENTS} -ge 0 ]; do
     git checkout ${CURRENT_BRANCH}~${PARENTS}
   fi
 
-  make regressiontests || exit 1
+  # Check wether target 'regressiontest' or 'check' or whatever exists, then
+  # run the test.
+  make -n regressiontests >/dev/null 2>&1 && (make regressiontests || exit 1)
+  make -n check >/dev/null 2>&1 && ((make && make check) || exit 1)
 
   let PARENTS=${PARENTS}-1
 done
diff --git a/tools/git-step-rebase b/tools/git-step-rebase
index aedeb2c..ab16514 100755
--- a/tools/git-step-rebase
+++ b/tools/git-step-rebase
@@ -41,8 +41,7 @@ COMMON_PARENT=$(git merge-base HEAD ${BASE_BRANCH})
 echo
 echo "Common parent is ${COMMON_PARENT}."
 
-PARENTS=$(git log --oneline --ancestry-path ${COMMON_PARENT}..${BASE_BRANCH} | \
-          wc -l)
+PARENTS=$(git rev-list ${COMMON_PARENT}..${BASE_BRANCH} | wc -l)
 echo "${PARENTS} commits to go."
 let PARENTS=${PARENTS}-1