diff --git a/docs_test.go b/docs_test.go
index f18d12d2f9..c0c851ed3c 100644
--- a/docs_test.go
+++ b/docs_test.go
@@ -1,76 +1,9 @@
 package cli
 
 import (
-	"io/ioutil"
 	"testing"
 )
 
-func testApp() *App {
-	app := NewApp()
-	app.Name = "greet"
-	app.Flags = []Flag{
-		StringFlag{
-			Name:      "socket, s",
-			Usage:     "some 'usage' text",
-			Value:     "value",
-			TakesFile: true,
-		},
-		StringFlag{Name: "flag, fl, f"},
-		BoolFlag{
-			Name:  "another-flag, b",
-			Usage: "another usage text",
-		},
-	}
-	app.Commands = []Command{{
-		Aliases: []string{"c"},
-		Flags: []Flag{
-			StringFlag{
-				Name:      "flag, fl, f",
-				TakesFile: true,
-			},
-			BoolFlag{
-				Name:  "another-flag, b",
-				Usage: "another usage text",
-			},
-		},
-		Name:  "config",
-		Usage: "another usage test",
-		Subcommands: []Command{{
-			Aliases: []string{"s", "ss"},
-			Flags: []Flag{
-				StringFlag{Name: "sub-flag, sub-fl, s"},
-				BoolFlag{
-					Name:  "sub-command-flag, s",
-					Usage: "some usage text",
-				},
-			},
-			Name:  "sub-config",
-			Usage: "another usage test",
-		}},
-	}, {
-		Aliases: []string{"i", "in"},
-		Name:    "info",
-		Usage:   "retrieve generic information",
-	}, {
-		Name: "some-command",
-	}, {
-		Name:   "hidden-command",
-		Hidden: true,
-	}}
-	app.UsageText = "app [first_arg] [second_arg]"
-	app.Usage = "Some app"
-	app.Author = "Harrison"
-	app.Email = "harrison@lolwut.com"
-	app.Authors = []Author{{Name: "Oliver Allen", Email: "oliver@toyshop.com"}}
-	return app
-}
-
-func expectFileContent(t *testing.T, file, expected string) {
-	data, err := ioutil.ReadFile(file)
-	expect(t, err, nil)
-	expect(t, string(data), expected)
-}
-
 func TestToMarkdownFull(t *testing.T) {
 	// Given
 	app := testApp()
diff --git a/fish_test.go b/fish_test.go
index a4c1871438..62313f0bbb 100644
--- a/fish_test.go
+++ b/fish_test.go
@@ -1,9 +1,76 @@
 package cli
 
 import (
+	"io/ioutil"
 	"testing"
 )
 
+func testApp() *App {
+	app := NewApp()
+	app.Name = "greet"
+	app.Flags = []Flag{
+		StringFlag{
+			Name:      "socket, s",
+			Usage:     "some 'usage' text",
+			Value:     "value",
+			TakesFile: true,
+		},
+		StringFlag{Name: "flag, fl, f"},
+		BoolFlag{
+			Name:  "another-flag, b",
+			Usage: "another usage text",
+		},
+	}
+	app.Commands = []Command{{
+		Aliases: []string{"c"},
+		Flags: []Flag{
+			StringFlag{
+				Name:      "flag, fl, f",
+				TakesFile: true,
+			},
+			BoolFlag{
+				Name:  "another-flag, b",
+				Usage: "another usage text",
+			},
+		},
+		Name:  "config",
+		Usage: "another usage test",
+		Subcommands: []Command{{
+			Aliases: []string{"s", "ss"},
+			Flags: []Flag{
+				StringFlag{Name: "sub-flag, sub-fl, s"},
+				BoolFlag{
+					Name:  "sub-command-flag, s",
+					Usage: "some usage text",
+				},
+			},
+			Name:  "sub-config",
+			Usage: "another usage test",
+		}},
+	}, {
+		Aliases: []string{"i", "in"},
+		Name:    "info",
+		Usage:   "retrieve generic information",
+	}, {
+		Name: "some-command",
+	}, {
+		Name:   "hidden-command",
+		Hidden: true,
+	}}
+	app.UsageText = "app [first_arg] [second_arg]"
+	app.Usage = "Some app"
+	app.Author = "Harrison"
+	app.Email = "harrison@lolwut.com"
+	app.Authors = []Author{{Name: "Oliver Allen", Email: "oliver@toyshop.com"}}
+	return app
+}
+
+func expectFileContent(t *testing.T, file, expected string) {
+	data, err := ioutil.ReadFile(file)
+	expect(t, err, nil)
+	expect(t, string(data), expected)
+}
+
 func TestFishCompletion(t *testing.T) {
 	// Given
 	app := testApp()