diff --git a/client/fingerprint/cpu_test.go b/client/fingerprint/cpu_test.go
index f18bbcfb3..55c1e1008 100644
--- a/client/fingerprint/cpu_test.go
+++ b/client/fingerprint/cpu_test.go
@@ -35,8 +35,8 @@ func TestCPUFingerprint(t *testing.T) {
 		t.Fatalf("Missing CPU Total Compute")
 	}
 
-	if node.Resources == nil {
-		t.Fatalf("Expected resources on node, but got nil")
+	if node.Resources == nil || node.Resources.CPU == 0 {
+		t.Fatalf("Expected to find CPU Resources")
 	}
 
 }
diff --git a/client/fingerprint/memory_test.go b/client/fingerprint/memory_test.go
index be34eb244..44c79c0cb 100644
--- a/client/fingerprint/memory_test.go
+++ b/client/fingerprint/memory_test.go
@@ -25,5 +25,8 @@ func TestMemoryFingerprint(t *testing.T) {
 	if node.Resources == nil {
 		t.Fatalf("Node Resources was nil")
 	}
+	if node.Resources.MemoryMB == 0 {
+		t.Errorf("Expected node.Resources.MemoryMB to be non-zero")
+	}
 
 }
diff --git a/client/fingerprint/storage_test.go b/client/fingerprint/storage_test.go
index 469018a16..663ee358e 100644
--- a/client/fingerprint/storage_test.go
+++ b/client/fingerprint/storage_test.go
@@ -29,9 +29,12 @@ func TestStorageFingerprint(t *testing.T) {
 	}
 
 	if free > total {
-		t.Errorf("storage.bytesfree %d is larger than storage.bytestotal %d", free, total)
+		t.Fatalf("storage.bytesfree %d is larger than storage.bytestotal %d", free, total)
 	}
 
+	if node.Resources == nil {
+		t.Fatalf("Node Resources was nil")
+	}
 	if node.Resources.DiskMB == 0 {
 		t.Errorf("Expected node.Resources.DiskMB to be non-zero")
 	}