diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1d84330..7419361 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -176,15 +176,15 @@ jobs:
         run: |
           mv ${{ needs['build-and-push-iso']['outputs'][format('iso_name-{0}', matrix.version)] }} deploy.iso
           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 }}
+            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 75720df..c222730 100644
--- a/Makefile
+++ b/Makefile
@@ -255,7 +255,7 @@ test-iso:
 	done
 
 	# flapak tests
-	if [[ -n "$(FLATPAK_REMOTE_REFS)" ]]; \
+	if [ -n "$(FLATPAK_REMOTE_REFS)" ]; \
 	then \
 		chmod +x $(foreach test,$(filter flatpak_%,$(_TESTS)),tests/iso/$(test)); \
 		for test in $(_TESTS); \