diff --git a/cli/exp_rpty_test.go b/cli/exp_rpty_test.go
index 5089796f5a..b7f26beb87 100644
--- a/cli/exp_rpty_test.go
+++ b/cli/exp_rpty_test.go
@@ -33,14 +33,14 @@ func TestExpRpty(t *testing.T) {
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 
+		_ = agenttest.New(t, client.URL, agentToken)
+		_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()
+
 		cmdDone := tGo(t, func() {
 			err := inv.WithContext(ctx).Run()
 			assert.NoError(t, err)
 		})
 
-		_ = agenttest.New(t, client.URL, agentToken)
-		_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()
-
 		pty.WriteLine("exit")
 		<-cmdDone
 	})
@@ -56,14 +56,14 @@ func TestExpRpty(t *testing.T) {
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 
+		_ = agenttest.New(t, client.URL, agentToken)
+		_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()
+
 		cmdDone := tGo(t, func() {
 			err := inv.WithContext(ctx).Run()
 			assert.NoError(t, err)
 		})
 
-		_ = agenttest.New(t, client.URL, agentToken)
-		_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()
-
 		pty.ExpectMatch(randStr)
 		<-cmdDone
 	})