diff --git a/services/core/java/com/android/server/wm/RecentTasks.java b/services/core/java/com/android/server/wm/RecentTasks.java
index 184de58c8446c1ed57cd9f581e224ede2267db72..f33ecaa905319bd1a8c21c5079c2d1514385a6a3 100644
--- a/services/core/java/com/android/server/wm/RecentTasks.java
+++ b/services/core/java/com/android/server/wm/RecentTasks.java
@@ -301,12 +301,9 @@ class RecentTasks {
         }
 
         // Always update the reordering time when this is called to ensure that the timeout
-        // is reset.  Extend this duration when running in tests.
-        final long timeout = ActivityManager.isRunningInUserTestHarness()
-                ? mFreezeTaskListTimeoutMs * 10
-                : mFreezeTaskListTimeoutMs;
+        // is reset
         mService.mH.removeCallbacks(mResetFreezeTaskListOnTimeoutRunnable);
-        mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, timeout);
+        mService.mH.postDelayed(mResetFreezeTaskListOnTimeoutRunnable, mFreezeTaskListTimeoutMs);
     }
 
     /**