diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh
index 9f7a5c8b..ed341426 100644
--- a/tests/convert-tests.sh
+++ b/tests/convert-tests.sh
@@ -27,8 +27,8 @@ test(){
 		|| _fail "filesystem create failed"
 	$here/btrfs-convert $here/test.img >> convert-tests-results.txt 2>&1 \
 		|| _fail "btrfs-convert failed"
-	$here/btrfsck $here/test.img >> convert-tests-results.txt 2>&1 \
-		|| _fail "btrfsck detected errors"
+	$here/btrfs check $here/test.img >> convert-tests-results.txt 2>&1 \
+		|| _fail "btrfs check detected errors"
 }
 
 # btrfs-convert requires 4k blocksize.
diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh
index 8987d044..285bcf65 100644
--- a/tests/fsck-tests.sh
+++ b/tests/fsck-tests.sh
@@ -45,11 +45,11 @@ do
 		run_check tar xJf $i
 	fi
 
-	$here/btrfsck test.img >> $RESULT 2>&1
-	[ $? -eq 0 ] && _fail "btrfsck should have detected corruption"
+	$here/btrfs check test.img >> $RESULT 2>&1
+	[ $? -eq 0 ] && _fail "btrfs check should have detected corruption"
 
-	run_check $here/btrfsck --repair test.img
-	run_check $here/btrfsck test.img
+	run_check $here/btrfs check --repair test.img
+	run_check $here/btrfs check test.img
 done
 
 if [ -z $TEST_DEV ] || [ -z $TEST_MNT ];then
@@ -83,7 +83,7 @@ test_extent_tree_rebuild()
 		-b 4096 $TEST_DEV
 
 	$here/btrfs check $TEST_DEV >& /dev/null && \
-			_fail "fsck should detect failure"
+			_fail "btrfs check should detect failure"
 	run_check $here/btrfs check --init-extent-tree $TEST_DEV
 	run_check $here/btrfs check $TEST_DEV
 }