diff --git a/tests/testcases/common.py b/tests/testcases/common.py
index 093b7a8..442a90f 100644
--- a/tests/testcases/common.py
+++ b/tests/testcases/common.py
@@ -45,7 +45,7 @@ def find_picom_window(conn):
         if name.value.buf() == b"picom":
             return w
 
-def trigger_root_configure(conn):
+def prepare_root_configure(conn):
     setup = conn.get_setup()
     root = setup.roots[0].root
     # Xorg sends root ConfigureNotify when we add a new mode to an output
@@ -61,7 +61,11 @@ def trigger_root_configure(conn):
     # our xvfb is setup to only have 1 output
     output = reply.outputs[0]
     rr.AddOutputModeChecked(output, mode).check()
-    rr.SetCrtcConfig(reply.crtcs[0], reply.timestamp, reply.config_timestamp, 0, 0, mode, randr.Rotation.Rotate_0, 1, [output]).reply()
+    return reply, mode, output
+
+def trigger_root_configure(conn, reply, mode, output):
+    rr = conn(randr.key)
+    return rr.SetCrtcConfig(reply.crtcs[0], reply.timestamp, reply.config_timestamp, 0, 0, mode, randr.Rotation.Rotate_0, 1, [output])
 
 def find_32bit_visual(conn):
     setup = conn.get_setup()
diff --git a/tests/testcases/issue314_2.py b/tests/testcases/issue314_2.py
index 01192de..c19d6cd 100755
--- a/tests/testcases/issue314_2.py
+++ b/tests/testcases/issue314_2.py
@@ -3,7 +3,7 @@
 import xcffib.xproto as xproto
 import xcffib
 import time
-from common import set_window_name, trigger_root_configure
+from common import set_window_name
 
 conn = xcffib.connect()
 setup = conn.get_setup()
diff --git a/tests/testcases/issue314_3.py b/tests/testcases/issue314_3.py
index 8e5d62d..9d4ee3a 100755
--- a/tests/testcases/issue314_3.py
+++ b/tests/testcases/issue314_3.py
@@ -3,7 +3,7 @@
 import xcffib.xproto as xproto
 import xcffib
 import time
-from common import set_window_name, trigger_root_configure
+from common import set_window_name
 
 conn = xcffib.connect()
 setup = conn.get_setup()
diff --git a/tests/testcases/issue357.py b/tests/testcases/issue357.py
index ae637de..9f95a4d 100755
--- a/tests/testcases/issue357.py
+++ b/tests/testcases/issue357.py
@@ -3,7 +3,7 @@
 import xcffib.xproto as xproto
 import xcffib
 import time
-from common import set_window_name, trigger_root_configure
+from common import set_window_name, trigger_root_configure, prepare_root_configure
 
 conn = xcffib.connect()
 setup = conn.get_setup()
@@ -25,7 +25,8 @@ print("mapping 1")
 conn.core.MapWindowChecked(wid).check()
 time.sleep(0.5)
 
-trigger_root_configure(conn)
+reply, mode, output = prepare_root_configure(conn)
+trigger_root_configure(conn, reply, mode, output).reply()
 
 # Destroy the windows
 conn.core.DestroyWindowChecked(wid).check()
diff --git a/tests/testcases/issue465.py b/tests/testcases/issue465.py
index a4ac51b..588be91 100755
--- a/tests/testcases/issue465.py
+++ b/tests/testcases/issue465.py
@@ -3,7 +3,7 @@
 import xcffib.xproto as xproto
 import xcffib
 import time
-from common import set_window_name, trigger_root_configure
+from common import set_window_name
 
 conn = xcffib.connect()
 setup = conn.get_setup()