diff --git a/lib/fedorabase.pm b/lib/fedorabase.pm
index 422ed9e2..352a5cd2 100644
--- a/lib/fedorabase.pm
+++ b/lib/fedorabase.pm
@@ -17,6 +17,14 @@ sub console_login {
         check => 1,
         @_);
 
+    # There's a timing problem when we switch from a logged-in console
+    # to a non-logged in console and immediately call this function;
+    # if the switch lags a bit, this function will match one of the
+    # logged-in needles for the console we switched from, and get out
+    # of sync (e.g. https://openqa.stg.fedoraproject.org/tests/1664 )
+    # To avoid this, we'll sleep a couple of seconds before starting
+    sleep 2;
+
     my $good = "";
     my $bad = "";
     my $needuser = 1;