diff --git a/.golangci.yml b/.golangci.yml
index d07ab0e..0389669 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,3 +1,3 @@
 linters-settings:
   goimports:
-    local-prefixes: "github.com/namecoin"
+    local-prefixes: github.com/namecoin
diff --git a/.travis.yml b/.travis.yml
index 4a80a0d..c4b23ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ jobs:
         # lint with mandatory linters only.  Add more like this:
         # --disable=foo,bar
         - go get -v -d -t ./...
-        - bash testdata/golangci-linter.bash --disable=exhaustive,gci,godot,gofumpt,nlreturn
+        - bash testdata/golangci-linter.bash --disable=exhaustive,godot,gofumpt
     - os: linux
       stage: lint
       language: go
diff --git a/cmd/certinject/main.go b/cmd/certinject/main.go
index 212671f..8dfa9b8 100644
--- a/cmd/certinject/main.go
+++ b/cmd/certinject/main.go
@@ -8,9 +8,10 @@ import (
 	"io/ioutil"
 
 	"github.com/hlandau/xlog"
-	"github.com/namecoin/certinject"
 	easyconfig "gopkg.in/hlandau/easyconfig.v1"
 	"gopkg.in/hlandau/easyconfig.v1/cflag"
+
+	"github.com/namecoin/certinject"
 )
 
 var log, logp = xlog.New("certinject")
diff --git a/cryptoapi_windows.go b/cryptoapi_windows.go
index 15d5476..3952031 100644
--- a/cryptoapi_windows.go
+++ b/cryptoapi_windows.go
@@ -1,7 +1,9 @@
 package certinject
 
 import (
-	"crypto/sha1" // #nosec G505
+
+	// #nosec G505
+	"crypto/sha1"
 	"crypto/x509"
 	"encoding/hex"
 	"errors"
@@ -176,6 +178,7 @@ func injectCertCryptoAPI(derBytes []byte) {
 	store, err := cryptoAPINameToStore(cryptoAPIFlagPhysicalStoreName.Value())
 	if err != nil {
 		log.Errorf("error: %s", err.Error())
+
 		return
 	}
 
@@ -190,6 +193,7 @@ func injectCertCryptoAPI(derBytes []byte) {
 		fingerprintHexUpperList, err = allFingerprintsInStore(registryBase, storeKey)
 		if err != nil {
 			log.Errorf("Couldn't enumerate certificates in store: %s", err)
+
 			return
 		}
 	}
@@ -201,6 +205,7 @@ func injectCertCryptoAPI(derBytes []byte) {
 	if len(fingerprintHexUpperList) == 0 {
 		if derBytes == nil {
 			log.Errorf("No cert specified")
+
 			return
 		}
 
@@ -227,12 +232,14 @@ func injectSingleCertCryptoAPI(derBytes []byte, fingerprintHexUpper string,
 	blob, err := readInputBlob(derBytes, registryBase, storeKey+`\`+fingerprintHexUpper)
 	if err != nil {
 		log.Errorf("Couldn't read input blob: %s", err)
+
 		return
 	}
 
 	err = editBlob(blob)
 	if err != nil {
 		log.Errorf("Couldn't edit blob: %s", err)
+
 		return
 	}
 
@@ -240,6 +247,7 @@ func injectSingleCertCryptoAPI(derBytes []byte, fingerprintHexUpper string,
 	blobBytes, err := blob.Marshal()
 	if err != nil {
 		log.Errorf("Couldn't marshal cert blob: %s", err)
+
 		return
 	}
 
diff --git a/cryptoapi_windows_internal_test.go b/cryptoapi_windows_internal_test.go
index e8651a4..cc8db5c 100644
--- a/cryptoapi_windows_internal_test.go
+++ b/cryptoapi_windows_internal_test.go
@@ -50,17 +50,20 @@ func TestRegistryKeyNames(t *testing.T) {
 		store, ok := cryptoAPIStores[tc.Physical]
 		if !ok {
 			t.Errorf("test %q is invalid (store not defined)", tc.Physical)
+
 			continue
 		}
 
 		if err := cryptoAPIFlagLogicalStoreName.CfSetValue(tc.Logical); err != nil {
 			t.Errorf("test %q: %v", tc.Name, err)
+
 			continue
 		}
 
 		key := store.Key()
 		if key != tc.Key {
 			t.Errorf("test %q: expected key to be %q, got %q", tc.Name, tc.Key, key)
+
 			continue
 		}
 
@@ -81,6 +84,7 @@ func TestRegistryKeyNames(t *testing.T) {
 		base := store.Base
 		if base != tc.Base {
 			t.Errorf("test %q: expected base to be %v, got %v", tc.Name, base2str(t, tc.Base), base2str(t, base))
+
 			continue
 		}
 
diff --git a/testdata/golangci-linter.bash b/testdata/golangci-linter.bash
index a26a752..5efc334 100755
--- a/testdata/golangci-linter.bash
+++ b/testdata/golangci-linter.bash
@@ -27,7 +27,7 @@ echo "Shell checks passed."
 echo ----- Windows -----
 GOOS=windows go generate ./...
 # NSS support is unmaintained; don't bother us with complaints about it.
-GOOS=windows "$(go env GOPATH)"/bin/golangci-lint run --no-config --enable-all \
+GOOS=windows "$(go env GOPATH)"/bin/golangci-lint run --enable-all \
   --color always \
   --skip-files "file.go" \
   --skip-files "nss.go" \
@@ -37,7 +37,7 @@ GOOS=windows "$(go env GOPATH)"/bin/golangci-lint run --no-config --enable-all \
 
 echo ----- Linux -----
 GOOS=linux go generate ./...
-GOOS=linux "$(go env GOPATH)"/bin/golangci-lint run --no-config --enable-all \
+GOOS=linux "$(go env GOPATH)"/bin/golangci-lint run --enable-all \
   --color always \
   --skip-files "file.go" \
   --skip-files "nss.go" \