diff --git a/test/constcheck.sh b/test/constcheck.sh
index 350753a1..6b2f1606 100755
--- a/test/constcheck.sh
+++ b/test/constcheck.sh
@@ -5,14 +5,15 @@ CT='ct.c'
 echo '#include <assert.h>' > "$CT"
 echo '#include <sodium.h>' >> "$CT"
 echo 'int main(void) {' >> "$CT"
-for macro in $(egrep -r '#define crypto_.*BYTES ' src/libsodium/include | \
+for macro in $(egrep -r '#define crypto_.*BYTES(_[A-Z]+)? ' src/libsodium/include | \
                cut -d: -f2- | cut -d' ' -f2 | \
                fgrep -v edwards25519sha512batch | sort -u); do
   func=$(echo "$macro" | tr A-Z a-z)
-  echo "  assert($func() == $macro);" >> "$CT"
+  echo "    assert($func() == $macro);" >> "$CT"
 done
 echo "return 0; }" >> "$CT"
 
-cc "$CT" -lsodium && ./a.out
+cc "$CT" -lsodium || exit 1
+./a.out || exit 1
 rm -f a.out "$CT"