diff --git a/.gitignore b/.gitignore
index ebb67850c..8fb61aa7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -452,7 +452,7 @@ Makefile.in
 /test-data/phony-guests/debian.img
 /test-data/phony-guests/fedora.img
 /test-data/phony-guests/fedora-btrfs.img
-/test-data/phony-guests/fedora-luks.img
+/test-data/phony-guests/fedora-lvm-on-luks.img
 /test-data/phony-guests/fedora-md1.img
 /test-data/phony-guests/fedora-md2.img
 /test-data/phony-guests/fedora.db
diff --git a/test-data/phony-guests/Makefile.am b/test-data/phony-guests/Makefile.am
index 60313548a..0114d10bb 100644
--- a/test-data/phony-guests/Makefile.am
+++ b/test-data/phony-guests/Makefile.am
@@ -49,7 +49,7 @@ disk_images = \
 	fedora-md1.img \
 	fedora-md2.img \
 	fedora-btrfs.img \
-	fedora-luks.img \
+	fedora-lvm-on-luks.img \
 	ubuntu.img \
 	archlinux.img \
 	coreos.img \
@@ -96,11 +96,11 @@ fedora-btrfs.img: make-fedora-img.pl \
 		fedora.db
 	SRCDIR=$(srcdir) LAYOUT=btrfs $(top_builddir)/run --test ./$<
 
-# Make a (dummy) Fedora image with LVM encrypted with LUKS.
-fedora-luks.img: make-fedora-img.pl \
+# Make a (dummy) Fedora image with LVM-on-LUKS.
+fedora-lvm-on-luks.img: make-fedora-img.pl \
 		fedora-journal.tar.xz \
 		fedora.db
-	SRCDIR=$(srcdir) LAYOUT=lvm-luks $(top_builddir)/run --test ./$<
+	SRCDIR=$(srcdir) LAYOUT=lvm-on-luks $(top_builddir)/run --test ./$<
 
 # Make a (dummy) Debian image.
 debian.img: make-debian-img.sh
diff --git a/test-data/phony-guests/guests.xml.in b/test-data/phony-guests/guests.xml.in
index 4139d04f6..3af6b27af 100644
--- a/test-data/phony-guests/guests.xml.in
+++ b/test-data/phony-guests/guests.xml.in
@@ -185,7 +185,7 @@
 
   <!-- LUKS password is 'FEDORA' -->
   <domain type='test'>
-    <name>fedora-luks</name>
+    <name>fedora-lvm-on-luks</name>
     <memory>1048576</memory>
     <os>
       <type>hvm</type>
@@ -194,7 +194,7 @@
     <devices>
       <disk type='file' device='disk'>
         <driver name='qemu' type='raw'/>
-        <source file='@abs_builddir@/fedora-luks.img'/>
+        <source file='@abs_builddir@/fedora-lvm-on-luks.img'/>
         <target dev='vda' bus='virtio'/>
       </disk>
     </devices>
diff --git a/test-data/phony-guests/make-fedora-img.pl b/test-data/phony-guests/make-fedora-img.pl
index 27b154f9d..4cd6ef957 100755
--- a/test-data/phony-guests/make-fedora-img.pl
+++ b/test-data/phony-guests/make-fedora-img.pl
@@ -171,8 +171,8 @@ EOF
     }
 }
 
-elsif ($ENV{LAYOUT} eq 'lvm-luks') {
-    push (@images, "fedora-luks.img-t");
+elsif ($ENV{LAYOUT} eq 'lvm-on-luks') {
+    push (@images, "fedora-lvm-on-luks.img-t");
 
     open (my $fstab, '>', "fedora.fstab") or die;
     print $fstab <<EOF;
@@ -183,9 +183,9 @@ EOF
 
     $bootdev = '/dev/sda1';
 
-    $g->disk_create ("fedora-luks.img-t", "raw", $IMAGE_SIZE);
+    $g->disk_create ("fedora-lvm-on-luks.img-t", "raw", $IMAGE_SIZE);
 
-    $g->add_drive ("fedora-luks.img-t", format => "raw");
+    $g->add_drive ("fedora-lvm-on-luks.img-t", format => "raw");
     $g->launch ();
 
     $g->part_init ('/dev/sda', 'mbr');
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 690e09b5e..911272675 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -464,12 +464,12 @@ TESTS += \
 	luks/test-luks.sh \
 	luks/test-luks-list.sh \
 	luks/test-key-option.sh \
-	luks/test-key-option-inspect.sh
+	luks/test-key-option-inspect-lvm-on-luks.sh
 EXTRA_DIST += \
 	luks/test-luks.sh \
 	luks/test-luks-list.sh \
 	luks/test-key-option.sh \
-	luks/test-key-option-inspect.sh
+	luks/test-key-option-inspect-lvm-on-luks.sh
 
 TESTS += \
 	lvm/test-lvm-filtering.sh \
diff --git a/tests/luks/test-key-option-inspect.sh b/tests/luks/test-key-option-inspect-lvm-on-luks.sh
similarity index 94%
rename from tests/luks/test-key-option-inspect.sh
rename to tests/luks/test-key-option-inspect-lvm-on-luks.sh
index 78128db84..3d2bb9e6c 100755
--- a/tests/luks/test-key-option-inspect.sh
+++ b/tests/luks/test-key-option-inspect-lvm-on-luks.sh
@@ -24,9 +24,9 @@ set -e
 $TEST_FUNCTIONS
 skip_if_skipped
 skip_unless_feature_available luks
-skip_unless_phony_guest fedora-luks.img
+skip_unless_phony_guest fedora-lvm-on-luks.img
 
-disk=../test-data/phony-guests/fedora-luks.img
+disk=../test-data/phony-guests/fedora-lvm-on-luks.img
 device=/dev/sda2
 
 # Get the UUID of the LUKS device.