diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt
index 47c782aed65a..1ed996010935 100644
--- a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt
+++ b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/OrientationDelegateTest.kt
@@ -47,7 +47,7 @@ class OrientationDelegateTest : BaseSessionTest() {
 
     private fun lockPortrait() {
         val promise = mainSession.evaluatePromiseJS("screen.orientation.lock('portrait-primary')")
-        sessionRule.waitUntilCalled(object : OrientationController.OrientationDelegate {
+        sessionRule.delegateDuringNextWait(object : OrientationController.OrientationDelegate {
             @AssertCalled(count = 1)
             override fun onOrientationLock(aOrientation: Int): GeckoResult<AllowOrDeny> {
                 assertThat(
@@ -63,11 +63,13 @@ class OrientationDelegateTest : BaseSessionTest() {
         })
         sessionRule.runtime.orientationChanged(Configuration.ORIENTATION_PORTRAIT)
         promise.value
+        // Remove previous delegate
+        mainSession.waitForRoundTrip()
     }
 
     private fun lockLandscape() {
         val promise = mainSession.evaluatePromiseJS("screen.orientation.lock('landscape-primary')")
-        sessionRule.waitUntilCalled(object : OrientationController.OrientationDelegate {
+        sessionRule.delegateDuringNextWait(object : OrientationController.OrientationDelegate {
             @AssertCalled(count = 1)
             override fun onOrientationLock(aOrientation: Int): GeckoResult<AllowOrDeny> {
                 assertThat(
@@ -83,6 +85,8 @@ class OrientationDelegateTest : BaseSessionTest() {
         })
         sessionRule.runtime.orientationChanged(Configuration.ORIENTATION_LANDSCAPE)
         promise.value
+        // Remove previous delegate
+        mainSession.waitForRoundTrip()
     }
 
     @Test fun orientationLock() {
@@ -144,7 +148,7 @@ class OrientationDelegateTest : BaseSessionTest() {
         goFullscreen()
 
         val promise = mainSession.evaluatePromiseJS("screen.orientation.lock('landscape-primary')")
-        sessionRule.waitUntilCalled(object : OrientationController.OrientationDelegate {
+        sessionRule.delegateDuringNextWait(object : OrientationController.OrientationDelegate {
             @AssertCalled(count = 1)
             override fun onOrientationLock(aOrientation: Int): GeckoResult<AllowOrDeny> {
                 assertThat(
@@ -160,6 +164,8 @@ class OrientationDelegateTest : BaseSessionTest() {
         })
         sessionRule.runtime.orientationChanged(Configuration.ORIENTATION_LANDSCAPE)
         promise.value
+        // Remove previous delegate
+        mainSession.waitForRoundTrip()
 
         // after locking to orientation landscape, unlock to default
         mainSession.evaluateJS("screen.orientation.unlock()")