diff --git a/client/manager_test.go b/client/manager_test.go
index d0f01a6afb4..0c7bdcdcfe8 100644
--- a/client/manager_test.go
+++ b/client/manager_test.go
@@ -1,21 +1,22 @@
 package client_test
 
 import (
-	"net/http/httptest"
-	"net/url"
-	"testing"
 	r "gopkg.in/dancannon/gorethink.v2"
 	"log"
+	"net/http/httptest"
+	"net/url"
 	"os"
+	"testing"
 	"time"
 
 	"fmt"
 	"github.com/julienschmidt/httprouter"
+	_ "github.com/lib/pq"
 	"github.com/ory-am/fosite"
 	. "github.com/ory-am/hydra/client"
-	_ "github.com/lib/pq"
 	"github.com/ory-am/hydra/compose"
 	"github.com/ory-am/hydra/herodot"
+	"github.com/ory-am/hydra/integration"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/ladon"
 	"github.com/pborman/uuid"
@@ -23,7 +24,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"
 	"gopkg.in/ory-am/dockertest.v3"
-	"github.com/ory-am/hydra/integration"
 )
 
 var clientManagers = map[string]Storage{}
diff --git a/cmd/cli/handler_client.go b/cmd/cli/handler_client.go
index 7da1b8f2796..66b9a161869 100644
--- a/cmd/cli/handler_client.go
+++ b/cmd/cli/handler_client.go
@@ -7,11 +7,11 @@ import (
 
 	"strings"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/ory-am/hydra/client"
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/spf13/cobra"
-	"github.com/Sirupsen/logrus"
 )
 
 type ClientHandler struct {
diff --git a/cmd/cli/handler_recovation.go b/cmd/cli/handler_recovation.go
index e0818a69685..fea0f40a604 100644
--- a/cmd/cli/handler_recovation.go
+++ b/cmd/cli/handler_recovation.go
@@ -2,13 +2,13 @@ package cli
 
 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/oauth2"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2/clientcredentials"
-	"crypto/tls"
 	"net/http"
 )
 
diff --git a/cmd/connect.go b/cmd/connect.go
index 233ed66d21b..7803662572b 100644
--- a/cmd/connect.go
+++ b/cmd/connect.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/spf13/cobra"
 	"github.com/Sirupsen/logrus"
+	"github.com/spf13/cobra"
 )
 
 // connectCmd represents the connect command
diff --git a/integration/docker.go b/integration/docker.go
index 519ab60fbd1..b0215a0911f 100644
--- a/integration/docker.go
+++ b/integration/docker.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"fmt"
+	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
-	_ "github.com/go-sql-driver/mysql"
 	"gopkg.in/ory-am/dockertest.v3"
 	"gopkg.in/redis.v5"
 )
diff --git a/jwk/manager_test.go b/jwk/manager_test.go
index a1ad77afe74..f9f9f5f23d5 100644
--- a/jwk/manager_test.go
+++ b/jwk/manager_test.go
@@ -5,26 +5,26 @@ import (
 	"net/url"
 	"testing"
 
+	"crypto/rand"
+	"fmt"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/compose"
 	"github.com/ory-am/hydra/herodot"
+	"github.com/ory-am/hydra/integration"
 	. "github.com/ory-am/hydra/jwk"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/ladon"
-	"github.com/stretchr/testify/assert"
-	r "gopkg.in/dancannon/gorethink.v2"
-	"log"
-	"os"
-	"time"
-	"crypto/rand"
-	"fmt"
 	"github.com/pkg/errors"
 	"github.com/square/go-jose"
+	"github.com/stretchr/testify/assert"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 	"io"
+	"log"
 	"net/http"
-	"github.com/ory-am/hydra/integration"
+	"os"
+	"time"
 )
 
 var managers = map[string]Manager{}
diff --git a/oauth2/fosite_store_test.go b/oauth2/fosite_store_test.go
index dce0718ddc8..24df067025f 100644
--- a/oauth2/fosite_store_test.go
+++ b/oauth2/fosite_store_test.go
@@ -11,13 +11,13 @@ import (
 	c "github.com/ory-am/common/pkg"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/client"
+	"github.com/ory-am/hydra/integration"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/pborman/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"
 	r "gopkg.in/dancannon/gorethink.v2"
-	"github.com/ory-am/hydra/integration"
 )
 
 var rethinkManager *FositeRehinkDBStore
diff --git a/oauth2/revocator_http.go b/oauth2/revocator_http.go
index 6f7ca68dbc1..cd682e9d602 100644
--- a/oauth2/revocator_http.go
+++ b/oauth2/revocator_http.go
@@ -15,7 +15,7 @@ type HTTPRecovator struct {
 	Config   *clientcredentials.Config
 	Dry      bool
 	Endpoint *url.URL
-	Client *http.Client
+	Client   *http.Client
 }
 
 func (r *HTTPRecovator) RevokeToken(ctx context.Context, token string) error {