diff --git a/.travis.yml b/.travis.yml
index 98834e67e6..929172cc59 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,17 @@ jobs:
   include:
     - os: windows
       env: SLOW_TEST_FACTOR=100 BUILDFLAGS='' GOPASS_OUTPUT=gopass.exe
+      script:
+      - make travis-windows
     - os: osx
       env: SLOW_TEST_FACTOR=100
+      script:
+      - make travis-osx
     - os: linux
+      script:
+      - make travis
+      - make test-integration
+      - make install-completion
 
 before_install:
   - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install git gnupg2 clang-format-3.9; fi
@@ -26,10 +34,5 @@ before_install:
 go:
   - '1.14.x'
 
-script:
-  - ./travis_helper.sh travis
-  - make test-integration
-  - make install-completion
-
 after_success:
   - bash <(curl -s https://codecov.io/bash) -f coverage-all.out
diff --git a/Makefile b/Makefile
index eb0d18f72f..3c1b5a9cd6 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ all: build completion
 build: $(GOPASS_OUTPUT)
 completion: $(BASH_COMPLETION_OUTPUT) $(FISH_COMPLETION_OUTPUT) $(ZSH_COMPLETION_OUTPUT)
 travis: sysinfo crosscompile build install fulltest codequality completion full
-travis-osx: sysinfo build install fulltest completion full
-travis-windows: sysinfo build install fulltest-nocover completion full
+travis-osx: sysinfo build install test completion full
+travis-windows: sysinfo build install test completion
 
 sysinfo:
 	@echo ">> SYSTEM INFORMATION"
@@ -127,7 +127,7 @@ crosscompile:
 
 full:
 	@echo -n ">> COMPILE linux/amd64 xc"
-	$(GO) build -o $(GOPASS_OUTPUT)-linux-amd64-full -tags "xc"
+	$(GO) build -o $(GOPASS_OUTPUT)-full -tags "xc"
 
 %.completion: $(GOPASS_OUTPUT)
 	@printf ">> $* completion, output = $@"
diff --git a/README.md b/README.md
index a9ab0b5d67..d32c31ff08 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="logo.png" height="250" alt="gopass Gopher by Vincent Leinweber, remixed from the Renée French original Gopher" title="gopass Gopher by Vincent Leinweber, remixed from the Renée French original Gopher" />
+    <img src="docs/logo.png" height="250" alt="gopass Gopher by Vincent Leinweber, remixed from the Renée French original Gopher" title="gopass Gopher by Vincent Leinweber, remixed from the Renée French original Gopher" />
 </p>
 
 # gopass
diff --git a/commands.go b/commands.go
index 20b99f614c..7513c0783f 100644
--- a/commands.go
+++ b/commands.go
@@ -43,35 +43,6 @@ func getCommands(ctx context.Context, action *ap.Action, app *cli.App) []*cli.Co
 				},
 			}},
 		},
-		{
-			Name:    "otp",
-			Usage:   "Generate time- or hmac-based tokens",
-			Aliases: []string{"totp", "hotp"},
-			Hidden:  true,
-			Description: "" +
-				"Tries to parse an OTP URL (otpauth://). URL can be TOTP or HOTP. " +
-				"The URL can be provided on its own line or on a key value line with a key named 'totp'.",
-			Before:       action.Initialized,
-			Action:       action.OTP,
-			BashComplete: action.Complete,
-			Flags: []cli.Flag{
-				&cli.BoolFlag{
-					Name:    "clip",
-					Aliases: []string{"c"},
-					Usage:   "Copy the time-based token into the clipboard",
-				},
-				&cli.StringFlag{
-					Name:    "qr",
-					Aliases: []string{"q"},
-					Usage:   "Write QR code to FILE",
-				},
-				&cli.BoolFlag{
-					Name:    "password",
-					Aliases: []string{"o"},
-					Usage:   "Only display the token",
-				},
-			},
-		},
 	}
 	cmds = append(cmds, action.GetCommands()...)
 	cmds = append(cmds, xc.GetCommands()...)
diff --git a/commands_test.go b/commands_test.go
index 3e392d57b0..ff9c31509e 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -102,10 +102,6 @@ func testCommands(t *testing.T, c *cli.Context, commands []*cli.Command, prefix
 		if cmd.Name == "update" {
 			continue
 		}
-		if cmd.Name == "configure" && prefix == ".jsonapi" {
-			// running jsonapi configure will overwrite the chrome manifest
-			continue
-		}
 		if len(cmd.Subcommands) > 0 {
 			testCommands(t, c, cmd.Subcommands, prefix+"."+cmd.Name)
 		}
diff --git a/logo-small.png b/docs/logo-small.png
similarity index 100%
rename from logo-small.png
rename to docs/logo-small.png
diff --git a/logo.png b/docs/logo.png
similarity index 100%
rename from logo.png
rename to docs/logo.png
diff --git a/logo.svg b/docs/logo.svg
similarity index 100%
rename from logo.svg
rename to docs/logo.svg
diff --git a/internal/action/commands.go b/internal/action/commands.go
index 642935c45b..e0fc283f94 100644
--- a/internal/action/commands.go
+++ b/internal/action/commands.go
@@ -555,6 +555,35 @@ func (s *Action) GetCommands() []*cli.Command {
 				},
 			},
 		},
+		{
+			Name:    "otp",
+			Usage:   "Generate time- or hmac-based tokens",
+			Aliases: []string{"totp", "hotp"},
+			Hidden:  true,
+			Description: "" +
+				"Tries to parse an OTP URL (otpauth://). URL can be TOTP or HOTP. " +
+				"The URL can be provided on its own line or on a key value line with a key named 'totp'.",
+			Before:       s.Initialized,
+			Action:       s.OTP,
+			BashComplete: s.Complete,
+			Flags: []cli.Flag{
+				&cli.BoolFlag{
+					Name:    "clip",
+					Aliases: []string{"c"},
+					Usage:   "Copy the time-based token into the clipboard",
+				},
+				&cli.StringFlag{
+					Name:    "qr",
+					Aliases: []string{"q"},
+					Usage:   "Write QR code to FILE",
+				},
+				&cli.BoolFlag{
+					Name:    "password",
+					Aliases: []string{"o"},
+					Usage:   "Only display the token",
+				},
+			},
+		},
 		{
 			Name:  "recipients",
 			Usage: "Edit recipient permissions",
diff --git a/travis_helper.sh b/travis_helper.sh
deleted file mode 100755
index 3a5f30de46..0000000000
--- a/travis_helper.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -eux
-
-if [ $TRAVIS_OS_NAME = linux ]; then
-  make $1
-else
-  make $1-$TRAVIS_OS_NAME
-fi