diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 73547e6..dc81e1c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -169,7 +169,16 @@ jobs:
       - name: Run ISO checks
         run: |
           mv ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }} deploy.iso
-          make test-iso VERSION=${{ matrix.version }} FLATPAK_REMOTE_REFS="${{ env.FLATPAK_REMOTE_REFS}}"
+          make test-iso \
+            ARCH: ${{ env.ARCH}} \
+            IMAGE_NAME: ${{ env.IMAGE_NAME}} \
+            IMAGE_REPO: ${{ env.IMAGE_REPO}} \
+            IMAGE_TAG: ${{ env.IMAGE_TAG }} \
+            VERSION: ${{ matrix.version }} \
+            VARIANT: ${{ env.VARIANT }} \
+            FLATPAK_REMOTE_REFS_DIR: ${{ env.FLATPAK_REMOTE_REFS_DIR }} \
+            SECURE_BOOT_KEY_URL: ${{ env.SECURE_BOOT_KEY_URL }} \
+            ENROLLMENT_PASSWORD: ${{ env.ENROLLMENT_PASSWORD }}
 
       - name: Add Kickstart and Grub options to ISO
         run: |
diff --git a/Makefile b/Makefile
index b0f9ae4..1214a4f 100644
--- a/Makefile
+++ b/Makefile
@@ -246,12 +246,23 @@ test-iso:
 	sudo mount -o loop deploy.iso /mnt/iso
 	sudo mount -t squashfs -o loop /mnt/iso/images/install.img /mnt/install
 
-	chmod +x $(foreach test,$(_TESTS),tests/iso/$(test))
+	# install tests
+	chmod +x $(foreach test,$(filter install_%,$(_TESTS)),tests/iso/$(test))
 	for test in $(_TESTS); \
 	do \
 	  $(foreach var,$(_VARS),$(var)=$($(var))) ./tests/iso/$${test}; \
 	done
 
+	# flapak tests
+	if [[ -n "$(FLATPAK_REMOTE_REFS)" ]]; \
+	then \
+		chmod +x $(foreach test,$(filter flatpak_%,$(_TESTS)),tests/iso/$(test)); \
+		for test in $(_TESTS); \
+		do \
+		$(foreach var,$(_VARS),$(var)=$($(var))) ./tests/iso/$${test}; \
+		done; \
+	fi
+
 	# Cleanup
 	sudo umount /mnt/install
 	sudo umount /mnt/iso
diff --git a/tests/iso/verify_flatpakrepo_updated.sh b/tests/iso/flatpak_repo_updated.sh
similarity index 100%
rename from tests/iso/verify_flatpakrepo_updated.sh
rename to tests/iso/flatpak_repo_updated.sh
diff --git a/tests/iso/os-release.sh b/tests/iso/install_os-release.sh
similarity index 100%
rename from tests/iso/os-release.sh
rename to tests/iso/install_os-release.sh
diff --git a/tests/vm/flatpak.yml b/tests/vm/flatpak_update.yml
similarity index 100%
rename from tests/vm/flatpak.yml
rename to tests/vm/flatpak_update.yml