diff --git a/.github/workflows/units.yml b/.github/workflows/units.yml
index 9ccf2c6379b..f46fe762663 100644
--- a/.github/workflows/units.yml
+++ b/.github/workflows/units.yml
@@ -54,8 +54,9 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
+          - ubuntu-20.04
           - macos-latest
-          - macos-10.15
+          - macos-11
     runs-on: ${{ matrix.os }}
     steps:
 
diff --git a/.github/workflows/update-repos.yml b/.github/workflows/update-repos.yml
index 1c4c29d2d7b..425c8d40d05 100644
--- a/.github/workflows/update-repos.yml
+++ b/.github/workflows/update-repos.yml
@@ -342,7 +342,7 @@ jobs:
 
   update-rpm:
     name: Update RPM Repository
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     environment: ${{ needs.setup.outputs.secrets-environment }}
     needs: setup
     env:
diff --git a/command/v7/logs_command_test.go b/command/v7/logs_command_test.go
index 530b7be0f6d..dca73bcdc1d 100644
--- a/command/v7/logs_command_test.go
+++ b/command/v7/logs_command_test.go
@@ -312,6 +312,25 @@ var _ = Describe("logs command", func() {
 				When("there is an error refreshing a token sometime later", func() {
 					BeforeEach(func() {
 						cmd.Recent = false
+						fakeActor.GetStreamingLogsForApplicationByNameAndSpaceStub =
+							func(_ string, _ string, _ sharedaction.LogCacheClient) (
+								<-chan sharedaction.LogMessage,
+								<-chan error, context.CancelFunc,
+								v7action.Warnings,
+								error) {
+
+								logStream := make(chan sharedaction.LogMessage)
+								errorStream := make(chan error)
+
+								go func() {
+									time.Sleep(100 * time.Millisecond)
+									close(logStream)
+									close(errorStream)
+									return
+								}()
+
+								return logStream, errorStream, func() {}, v7action.Warnings{}, nil
+							}
 						fakeActor.ScheduleTokenRefreshStub = func(
 							after func(time.Duration) <-chan time.Time,
 							stop chan struct{}, stoppedRefreshing chan struct{}) (<-chan error, error) {