diff --git a/tests/integration/cgroups.bats b/tests/integration/cgroups.bats
index a9c2ea4856f..d5ca1325dce 100644
--- a/tests/integration/cgroups.bats
+++ b/tests/integration/cgroups.bats
@@ -272,7 +272,6 @@ convert_hugetlb_size() {
 				"memory.low":   "524288",
 				"memory.high": "5242880",
 				"memory.max": "20484096",
-				"memory.swap.max": "20971520",
 				"pids.max": "99",
 				"cpu.max": "10000 100000",
 				"cpu.weight": "42"
@@ -289,7 +288,6 @@ convert_hugetlb_size() {
 	echo "$output" | grep -q '^memory.low:524288$'
 	echo "$output" | grep -q '^memory.high:5242880$'
 	echo "$output" | grep -q '^memory.max:20484096$'
-	echo "$output" | grep -q '^memory.swap.max:20971520$'
 	echo "$output" | grep -q '^pids.max:99$'
 	echo "$output" | grep -q '^cpu.max:10000 100000$'
 
@@ -297,12 +295,34 @@ convert_hugetlb_size() {
 	check_systemd_value "MemoryLow" 524288
 	check_systemd_value "MemoryHigh" 5242880
 	check_systemd_value "MemoryMax" 20484096
-	check_systemd_value "MemorySwapMax" 20971520
 	check_systemd_value "TasksMax" 99
 	check_cpu_quota 10000 100000 "100ms"
 	check_cpu_weight 42
 }
 
+@test "runc run (cgroup v2 resources.unified swap)" {
+	requires root cgroups_v2 cgroups_swap
+
+	set_cgroups_path
+	update_config ' .linux.resources.unified |= {
+				"memory.max": "20484096",
+				"memory.swap.max": "20971520"
+			}'
+
+	runc run -d --console-socket "$CONSOLE_SOCKET" test_cgroups_unified
+	[ "$status" -eq 0 ]
+
+	runc exec test_cgroups_unified sh -c 'cd /sys/fs/cgroup && grep . *.max'
+	[ "$status" -eq 0 ]
+	echo "$output"
+
+	echo "$output" | grep -q '^memory.max:20484096$'
+	echo "$output" | grep -q '^memory.swap.max:20971520$'
+
+	check_systemd_value "MemoryMax" 20484096
+	check_systemd_value "MemorySwapMax" 20971520
+}
+
 @test "runc run (cgroup v2 resources.unified override)" {
 	requires root cgroups_v2