diff --git a/suggestions_test.go b/suggestions_test.go
index 69401a5c8b..3b31250e8a 100644
--- a/suggestions_test.go
+++ b/suggestions_test.go
@@ -17,7 +17,7 @@ func TestSuggestFlag(t *testing.T) {
 		{"a", "--another-flag"},
 		{"hlp", "--help"},
 		{"k", ""},
-		{"soccer", "--socket"},
+		{"s", "-s"},
 	} {
 		// When
 		res := app.suggestFlag(app.Flags, testCase.provided)
@@ -61,6 +61,45 @@ func TestSuggestFlagFromError(t *testing.T) {
 	}
 }
 
+func TestSuggestFlagFromErrorWrongError(t *testing.T) {
+	// Given
+	app := testApp()
+
+	// When
+	_, err := app.suggestFlagFromError(errors.New("invalid"), "")
+
+	// Then
+	expect(t, true, err != nil)
+}
+
+func TestSuggestFlagFromErrorWrongCommand(t *testing.T) {
+	// Given
+	app := testApp()
+
+	// When
+	_, err := app.suggestFlagFromError(
+		errors.New(providedButNotDefinedErrMsg+"flag"),
+		"invalid",
+	)
+
+	// Then
+	expect(t, true, err != nil)
+}
+
+func TestSuggestFlagFromErrorNoSuggestion(t *testing.T) {
+	// Given
+	app := testApp()
+
+	// When
+	_, err := app.suggestFlagFromError(
+		errors.New(providedButNotDefinedErrMsg+""),
+		"",
+	)
+
+	// Then
+	expect(t, true, err != nil)
+}
+
 func TestSuggestCommand(t *testing.T) {
 	// Given
 	app := testApp()