diff --git a/userapi/userapi.go b/userapi/userapi.go
index 119520749..32f851cc7 100644
--- a/userapi/userapi.go
+++ b/userapi/userapi.go
@@ -16,11 +16,11 @@ package userapi
 
 import (
 	"github.com/gorilla/mux"
+	"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
+	"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/dendrite/userapi/internal"
 	"github.com/matrix-org/dendrite/userapi/inthttp"
-	"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
-	"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
@@ -34,8 +34,8 @@ func AddInternalRoutes(router *mux.Router, intAPI api.UserInternalAPI) {
 // can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes.
 func NewInternalAPI(accountDB accounts.Database, deviceDB devices.Database, serverName gomatrixserverlib.ServerName) api.UserInternalAPI {
 	return &internal.UserInternalAPI{
-		AccountDB: accountDB,
-		DeviceDB: deviceDB,
+		AccountDB:  accountDB,
+		DeviceDB:   deviceDB,
 		ServerName: serverName,
 	}
-}
\ No newline at end of file
+}
diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go
index cce36ecad..423a86125 100644
--- a/userapi/userapi_test.go
+++ b/userapi/userapi_test.go
@@ -127,7 +127,7 @@ func listenAndServe(t *testing.T, router *mux.Router) (apiURL string, cancel fun
 		srv.Handler = router
 		err := srv.Serve(listener)
 		if err != nil && err != http.ErrServerClosed {
-			t.Fatalf("Listen failed: %s", err)
+			t.Logf("Listen failed: %s", err)
 		}
 	}()