diff --git a/resources/VM-container-tests.sh b/resources/VM-container-tests.sh
index ad65c99..5066747 100755
--- a/resources/VM-container-tests.sh
+++ b/resources/VM-container-tests.sh
@@ -320,7 +320,14 @@ fi
 # -----------------------------------------------
 
 # copy for faster startup
-cp /usr/share/OVMF/OVMF_VARS.fd .
+if [ -f "/usr/share/OVMF/OVMF_VARS.fd" ];then
+	cp /usr/share/OVMF/OVMF_VARS.fd OVMF_VARS.fd
+elif [ -f "/usr/share/OVMF/OVMF_VARS_4M.fd" ];then
+	cp /usr/share/OVMF/OVMF_VARS_4M.fd OVMF_VARS.fd
+else
+	echo_error "Failed to locate OVMF_VARS"
+	exit 1
+fi
 
 STAGE="BOOT1"
 # Start test VM
diff --git a/resources/VM-management.sh b/resources/VM-management.sh
index 5f4140a..0582acb 100644
--- a/resources/VM-management.sh
+++ b/resources/VM-management.sh
@@ -90,6 +90,16 @@ wait_vm () {
 }
 
 start_vm() {
+	ovmf_code=""
+	if [ -f "/usr/share/OVMF/OVMF_CODE.fd" ];then
+		ovmf_code="/usr/share/OVMF/OVMF_CODE.fd"
+	elif [ -f "/usr/share/OVMF/OVMF_CODE_4M.fd" ];then
+		ovmf_code="/usr/share/OVMF/OVMF_CODE_4M.fd"
+	else
+		echo_error "Failed to locate OVMF_CODE"
+		exit 1
+	fi
+
     qemu-system-x86_64 -machine accel=kvm,vmport=off -m 64G -smp 4 -cpu host -bios OVMF.fd \
         -monitor unix:./${PROCESS_NAME}.qemumon,server,nowait \
         -name gyroidos-tester,process=${PROCESS_NAME} -nodefaults -nographic \
@@ -99,7 +109,7 @@ start_vm() {
         -device scsi-hd,drive=hd1 \
         -drive if=none,id=hd1,file=${PROCESS_NAME}.ext4fs,cache=directsync,format=raw \
         -device e1000,netdev=net0 -netdev user,id=net0,hostfwd=tcp::$SSH_PORT-:22 \
-        -drive "if=pflash,format=raw,readonly=on,file=/usr/share/OVMF/OVMF_CODE.fd" \
+        -drive "if=pflash,format=raw,readonly=on,file=$ovmf_code" \
         -drive "if=pflash,format=raw,file=./OVMF_VARS.fd" \
         $VNC \
         $TELNET \
diff --git a/vars/stepIntegrationTest.groovy b/vars/stepIntegrationTest.groovy
index 0e3138c..bddbdd0 100644
--- a/vars/stepIntegrationTest.groovy
+++ b/vars/stepIntegrationTest.groovy
@@ -99,7 +99,7 @@ def call(Map target) {
 	script {
 		def testFunc = integrationTestMap[target.gyroid_machine];
 		if (testFunc != null) {
-			if (target.buildtype != "schsm") {
+			if ("${target.schsm_serial}" == "") {
 				echo "Entering integration test without acquiring lock"
 				testFunc(target);
 			} else {