diff --git a/pkg/integration/tests/branch/unset_upstream.go b/pkg/integration/tests/branch/unset_upstream.go
index c38c0cd58..1d4746fd3 100644
--- a/pkg/integration/tests/branch/unset_upstream.go
+++ b/pkg/integration/tests/branch/unset_upstream.go
@@ -6,21 +6,27 @@ import (
 )
 
 var UnsetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Reset the upstream of a branch",
+	Description:  "Unset upstream of selected branch, both when it exists and when it doesn't",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
-		shell.EmptyCommit("one")
-		shell.CloneIntoRemote("origin")
-		shell.SetBranchUpstream("master", "origin/master")
+		shell.
+			EmptyCommit("one").
+			NewBranch("branch_to_remove").
+			Checkout("master").
+			CloneIntoRemote("origin").
+			SetBranchUpstream("master", "origin/master").
+			SetBranchUpstream("branch_to_remove", "origin/branch_to_remove").
+			// to get the "(upstream gone)" branch status
+			RunCommand([]string{"git", "push", "origin", "--delete", "branch_to_remove"})
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Branches().
 			Focus().
 			Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream
-			Lines(
-				Contains("master").Contains("origin master").IsSelected(),
+			SelectedLines(
+				Contains("master").Contains("origin master"),
 			).
 			Press(keys.Branches.SetUpstream).
 			Tap(func() {
@@ -29,8 +35,29 @@ var UnsetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
 					Select(Contains("Unset upstream of selected branch")).
 					Confirm()
 			}).
-			Lines(
-				Contains("master").DoesNotContain("origin master").IsSelected(),
+			SelectedLines(
+				Contains("master").DoesNotContain("origin master"),
+			)
+
+		t.Views().Branches().
+			Focus().
+			SelectNextItem().
+			SelectedLines(
+				Contains("branch_to_remove").Contains("origin branch_to_remove").Contains("upstream gone"),
+			).
+			Press(keys.Branches.SetUpstream).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Upstream options")).
+					Select(Contains("Unset upstream of selected branch")).
+					Confirm()
+				t.ExpectPopup().Alert().
+					Title(Equals("Error")).
+					Content(Equals("The selected branch has no upstream (or the upstream is not stored locally)")).
+					Cancel()
+			}).
+			SelectedLines(
+				Contains("branch_to_remove").Contains("origin branch_to_remove").Contains("upstream gone"),
 			)
 	},
 })