diff --git a/make/Makefile.test b/make/Makefile.test
index e9431be9fd5..7bb389f9b37 100644
--- a/make/Makefile.test
+++ b/make/Makefile.test
@@ -13,7 +13,7 @@ endif
 
 .PHONY: test-active
 test-active: prepare-test
-	VM_PID=$$(scripts/run_vm.sh vmpid) go run $(GINKGO) $(GINKGO_ARGS) ./tests/wait-active
+	VM_PID=$$(scripts/run_vm.sh vmpid) COS_PASS=cos go run $(GINKGO) $(GINKGO_ARGS) ./tests/wait-active
 
 .PHONY: prepare-installer-test
 prepare-installer-test:
@@ -63,7 +63,7 @@ test-downgrade: test-active
 
 .PHONY: test-upgrade
 test-upgrade: test-active
-	VM_PID=$$(scripts/run_vm.sh vmpid) go run $(GINKGO) $(GINKGO_ARGS) ./tests/upgrade -- $(UPGRADE_ARGS)
+	VM_PID=$$(scripts/run_vm.sh vmpid) COS_PASS=cos go run $(GINKGO) $(GINKGO_ARGS) ./tests/upgrade -- $(UPGRADE_ARGS)
 
 .PHONY: test-deps
 test-deps:
diff --git a/tests/upgrade/upgrade_test.go b/tests/upgrade/upgrade_test.go
index d1b0974ad52..8d51fc517af 100644
--- a/tests/upgrade/upgrade_test.go
+++ b/tests/upgrade/upgrade_test.go
@@ -40,6 +40,11 @@ var _ = Describe("Elemental Feature tests", func() {
 			By("setting /oem/chroot_hooks.yaml")
 			err := s.SendFile("../assets/chroot_hooks.yaml", "/oem/chroot_hooks.yaml", "0770")
 			Expect(err).ToNot(HaveOccurred())
+
+			// Upgrade tests might not include it as it booted from an older disk image.
+			err = s.SendFile("../assets/remote_login.yaml", "/oem/remote_login.yaml", "0770")
+			Expect(err).ToNot(HaveOccurred())
+
 			originalVersion := s.GetOSRelease("TIMESTAMP")
 
 			By(fmt.Sprintf("and upgrading to %s", comm.UpgradeImage()))