diff --git a/Makefile b/Makefile
index cb0c8e56c..b25134d02 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ COCKPIT_REPO_FILES = \
 	$(NULL)
 
 COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git
-COCKPIT_REPO_COMMIT = 5516784bc7aba7c6fb02d19c57afc4de953ccd17 # 315 + 39 commits
+COCKPIT_REPO_COMMIT = d39255f6f768cc1c37a5786be8e8dc9d8f4d5ed2 # 315 + 83 commits
 
 $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP)
 COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}'
diff --git a/test/check-application b/test/check-application
index a15aa8be4..329c6f17f 100755
--- a/test/check-application
+++ b/test/check-application
@@ -8,7 +8,7 @@ import sys
 import time
 
 import testlib
-from machine_core import ssh_connection
+from machine.machine_core import ssh_connection
 
 REGISTRIES_CONF = """
 [registries.search]
@@ -291,7 +291,7 @@ class TestApplication(testlib.MachineCase):
             memory = self.browser.text(f"#table-{pod_name}-title .pod-memory")
             try:
                 value, unit = memory.split(' ')
-                self.assertIn(unit, ["GB", "MB", "KB"])
+                self.assertIn(unit, ["GB", "MB", "kB", "B"])
                 return float(value)
             except ValueError:
                 # no unit → only for 0 or not initialized yet