diff --git a/test/auth_test.go b/test/auth_test.go
index 8b33e828..c360a9e5 100644
--- a/test/auth_test.go
+++ b/test/auth_test.go
@@ -30,7 +30,7 @@ func testInfoForAuth(t tLogger, infojs []byte) bool {
 func expectAuthRequired(t tLogger, c net.Conn) {
 	buf := expectResult(t, c, infoRe)
 	infojs := infoRe.FindAllSubmatch(buf, 1)[0][1]
-	if testInfoForAuth(t, infojs) != true {
+	if !testInfoForAuth(t, infojs) {
 		t.Fatalf("Expected server to require authorization: '%s'", infojs)
 	}
 }
diff --git a/test/maxpayload_test.go b/test/maxpayload_test.go
index 45e4a236..cf32a4d3 100644
--- a/test/maxpayload_test.go
+++ b/test/maxpayload_test.go
@@ -54,7 +54,7 @@ func TestMaxPayload(t *testing.T) {
 		t.Fatalf("Expected an error message to be sent by the server: %s", err)
 	}
 
-	if strings.Contains(string(errMsg), "Maximum Payload Violation") != true {
+	if !strings.Contains(string(errMsg), "Maximum Payload Violation") {
 		t.Errorf("Received wrong error message (%v)\n", string(errMsg))
 	}
 
diff --git a/test/opts_test.go b/test/opts_test.go
index 4c8a4d1b..5ff46a33 100644
--- a/test/opts_test.go
+++ b/test/opts_test.go
@@ -28,7 +28,7 @@ func TestTLSConfig(t *testing.T) {
 	defer c.Close()
 
 	sinfo := checkInfoMsg(t, c)
-	if sinfo.TLSRequired != true {
+	if !sinfo.TLSRequired {
 		t.Fatal("Expected TLSRequired to be true when configured")
 	}
 }
diff --git a/test/route_discovery_test.go b/test/route_discovery_test.go
index d48dcce0..5a3ce013 100644
--- a/test/route_discovery_test.go
+++ b/test/route_discovery_test.go
@@ -175,30 +175,30 @@ func TestSeedSolicitWorks(t *testing.T) {
 	url := fmt.Sprintf("http://%s:%d/", opts.Host, opts.HTTPPort)
 	rz := readHTTPRoutez(t, url)
 	ris := expectRids(t, rz, []string{s2.ID(), s3.ID()})
-	if ris[s2.ID()].IsConfigured == true {
+	if ris[s2.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
-	if ris[s3.ID()].IsConfigured == true {
+	if ris[s3.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 
 	url = fmt.Sprintf("http://%s:%d/", s2Opts.Host, s2Opts.HTTPPort)
 	rz = readHTTPRoutez(t, url)
 	ris = expectRids(t, rz, []string{s1.ID(), s3.ID()})
-	if ris[s1.ID()].IsConfigured != true {
+	if !ris[s1.ID()].IsConfigured {
 		t.Fatalf("Expected seed server to be configured\n")
 	}
-	if ris[s3.ID()].IsConfigured == true {
+	if ris[s3.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 
 	url = fmt.Sprintf("http://%s:%d/", s3Opts.Host, s3Opts.HTTPPort)
 	rz = readHTTPRoutez(t, url)
 	ris = expectRids(t, rz, []string{s1.ID(), s2.ID()})
-	if ris[s1.ID()].IsConfigured != true {
+	if !ris[s1.ID()].IsConfigured {
 		t.Fatalf("Expected seed server to be configured\n")
 	}
-	if ris[s2.ID()].IsConfigured == true {
+	if ris[s2.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 }
@@ -232,11 +232,11 @@ func checkConnected(t *testing.T, servers []serverInfo, current int, oneSeed boo
 		}
 		s := servers[i]
 		if current == 0 || ((oneSeed && i > 0) || (!oneSeed && (i != current-1))) {
-			if ris[s.server.ID()].IsConfigured != false {
+			if ris[s.server.ID()].IsConfigured {
 				return fmt.Errorf("Expected server %s:%d not to be configured", s.opts.Host, s.opts.Port)
 			}
 		} else if oneSeed || (i == current-1) {
-			if ris[s.server.ID()].IsConfigured != true {
+			if !ris[s.server.ID()].IsConfigured {
 				return fmt.Errorf("Expected server %s:%d to be configured", s.opts.Host, s.opts.Port)
 			}
 		}
@@ -351,30 +351,30 @@ func TestChainedSolicitWorks(t *testing.T) {
 	url := fmt.Sprintf("http://%s:%d/", opts.Host, opts.HTTPPort)
 	rz := readHTTPRoutez(t, url)
 	ris := expectRids(t, rz, []string{s2.ID(), s3.ID()})
-	if ris[s2.ID()].IsConfigured == true {
+	if ris[s2.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
-	if ris[s3.ID()].IsConfigured == true {
+	if ris[s3.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 
 	url = fmt.Sprintf("http://%s:%d/", s2Opts.Host, s2Opts.HTTPPort)
 	rz = readHTTPRoutez(t, url)
 	ris = expectRids(t, rz, []string{s1.ID(), s3.ID()})
-	if ris[s1.ID()].IsConfigured != true {
+	if !ris[s1.ID()].IsConfigured {
 		t.Fatalf("Expected seed server to be configured\n")
 	}
-	if ris[s3.ID()].IsConfigured == true {
+	if ris[s3.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 
 	url = fmt.Sprintf("http://%s:%d/", s3Opts.Host, s3Opts.HTTPPort)
 	rz = readHTTPRoutez(t, url)
 	ris = expectRids(t, rz, []string{s1.ID(), s2.ID()})
-	if ris[s2.ID()].IsConfigured != true {
+	if !ris[s2.ID()].IsConfigured {
 		t.Fatalf("Expected s2 server to be configured\n")
 	}
-	if ris[s1.ID()].IsConfigured == true {
+	if ris[s1.ID()].IsConfigured {
 		t.Fatalf("Expected seed server not to be configured\n")
 	}
 }
@@ -489,30 +489,30 @@ func TestAuthSeedSolicitWorks(t *testing.T) {
 	url := fmt.Sprintf("http://%s:%d/", opts.Host, opts.HTTPPort)
 	rz := readHTTPRoutez(t, url)
 	ris := expectRids(t, rz, []string{s2.ID(), s3.ID()})
-	if ris[s2.ID()].IsConfigured == true {
+	if ris[s2.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
-	if ris[s3.ID()].IsConfigured == true {
+	if ris[s3.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 
 	url = fmt.Sprintf("http://%s:%d/", s2Opts.Host, s2Opts.HTTPPort)
 	rz = readHTTPRoutez(t, url)
 	ris = expectRids(t, rz, []string{s1.ID(), s3.ID()})
-	if ris[s1.ID()].IsConfigured != true {
+	if !ris[s1.ID()].IsConfigured {
 		t.Fatalf("Expected seed server to be configured\n")
 	}
-	if ris[s3.ID()].IsConfigured == true {
+	if ris[s3.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 
 	url = fmt.Sprintf("http://%s:%d/", s3Opts.Host, s3Opts.HTTPPort)
 	rz = readHTTPRoutez(t, url)
 	ris = expectRids(t, rz, []string{s1.ID(), s2.ID()})
-	if ris[s1.ID()].IsConfigured != true {
+	if !ris[s1.ID()].IsConfigured {
 		t.Fatalf("Expected seed server to be configured\n")
 	}
-	if ris[s2.ID()].IsConfigured == true {
+	if ris[s2.ID()].IsConfigured {
 		t.Fatalf("Expected server not to be configured\n")
 	}
 }
@@ -542,7 +542,7 @@ func expectRidsNoFatal(t *testing.T, direct bool, rz *server.Routez, rids []stri
 	// Make result map for additional checking
 	ri := make(map[string]*server.RouteInfo)
 	for _, r := range rz.Routes {
-		if set[r.RemoteID] != true {
+		if !set[r.RemoteID] {
 			_, fn, line, _ := runtime.Caller(caller)
 			return nil, fmt.Errorf("[%s:%d] Route with rid %s unexpected, expected %+v\n", fn, line, r.RemoteID, rids)
 		}
diff --git a/test/test.go b/test/test.go
index 94630da6..cd011cc5 100644
--- a/test/test.go
+++ b/test/test.go
@@ -169,7 +169,7 @@ func stackFatalf(t tLogger, f string, args ...interface{}) {
 	// Generate the Stack of callers:
 	for i := 0; true; i++ {
 		_, file, line, ok := runtime.Caller(i)
-		if ok == false {
+		if !ok {
 			break
 		}
 		if file == testFile {