diff --git a/testing/make-testing b/testing/make-testing
index 7c2e4d567..1980e3b7d 100755
--- a/testing/make-testing
+++ b/testing/make-testing
@@ -9,16 +9,16 @@ then
 	$PWD/scripts/build-baseimage || exit 1
 fi
 
+if [ $ENABLE_BUILD_ROOTIMAGE = "yes" ]
+then
+	$PWD/scripts/build-rootimage || exit 1
+fi
+
 if [ $ENABLE_BUILD_GUESTKERNEL = "yes" ]
 then
 	$PWD/scripts/build-guestkernel || exit 1
 fi
 
-if [ $ENABLE_BUILD_UMLROOTFS = "yes" ]
-then
-	$PWD/scripts/build-umlrootfs || exit 1
-fi
-
 if [ $ENABLE_BUILD_UMLHOSTFS = "yes" ]
 then
 	$PWD/scripts/build-umlhostfs $HOSTS || exit 1
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-rootimage
similarity index 99%
rename from testing/scripts/build-umlrootfs
rename to testing/scripts/build-rootimage
index 1c452f476..1890c4eed 100755
--- a/testing/scripts/build-umlrootfs
+++ b/testing/scripts/build-rootimage
@@ -19,7 +19,6 @@ echo "Building root image"
 . $PWD/scripts/function.sh
 
 [ `id -u` -eq 0 ] || die "You must be root to run $0"
-
 [ -f "$BASEIMG" ] || die "Base image $BASEIMG not found"
 
 check_commands partprobe qemu-nbd
diff --git a/testing/testing.conf b/testing/testing.conf
index d4f520de1..4ed5fdd00 100644
--- a/testing/testing.conf
+++ b/testing/testing.conf
@@ -71,8 +71,8 @@ SSHCONF="-F $TESTDIR/testing/ssh_config"
 # Enable particular steps in the make-testing
 #
 ENABLE_BUILD_BASEIMAGE="yes"
+ENABLE_BUILD_ROOTIMAGE="yes"
 ENABLE_BUILD_GUESTKERNEL="yes"
-ENABLE_BUILD_UMLROOTFS="yes"
 ENABLE_BUILD_UMLHOSTFS="yes"
 
 ##############################################################