diff --git a/client/driver/lxc_test.go b/client/driver/lxc_test.go
index 7cd16934287d..2da65d86cad3 100644
--- a/client/driver/lxc_test.go
+++ b/client/driver/lxc_test.go
@@ -49,7 +49,7 @@ func TestLxcDriver_Fingerprint(t *testing.T) {
 			Resources:  &structs.Resources{},
 		}
 
-		err = d.Fingerprint(request, response)
+		err := d.Fingerprint(request, response)
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
@@ -65,7 +65,7 @@ func TestLxcDriver_Fingerprint(t *testing.T) {
 			Resources:  &structs.Resources{},
 		}
 
-		err = d.Fingerprint(request, response)
+		err := d.Fingerprint(request, response)
 		if err != nil {
 			t.Fatalf("err: %v", err)
 		}
diff --git a/client/fingerprint/env_aws_test.go b/client/fingerprint/env_aws_test.go
index 14c1e3bbbdac..1e60516b5437 100644
--- a/client/fingerprint/env_aws_test.go
+++ b/client/fingerprint/env_aws_test.go
@@ -31,6 +31,10 @@ func TestEnvAWSFingerprint_nonAws(t *testing.T) {
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}
+
+	if len(response.Attributes) > 0 {
+		t.Fatalf("Should not apply")
+	}
 }
 
 func TestEnvAWSFingerprint_aws(t *testing.T) {
diff --git a/client/fingerprint/vault_test.go b/client/fingerprint/vault_test.go
index 27f6f87b0a76..70948a0e0407 100644
--- a/client/fingerprint/vault_test.go
+++ b/client/fingerprint/vault_test.go
@@ -31,9 +31,6 @@ func TestVaultFingerprint(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to fingerprint: %s", err)
 	}
-	if len(response.Attributes) == 0 {
-		t.Fatalf("Failed to apply node attributes")
-	}
 
 	assertNodeAttributeContains(t, response.Attributes, "vault.accessible")
 	assertNodeAttributeContains(t, response.Attributes, "vault.version")