diff --git a/tests/query-all-tables.pl.in b/tests/query-all-tables.pl.in
index ddd315b6..7045748b 100644
--- a/tests/query-all-tables.pl.in
+++ b/tests/query-all-tables.pl.in
@@ -3,17 +3,21 @@
 use strict;
 use Hydra::Schema;
 use Hydra::Helper::Nix;
-use Hydra::Helper::AddBuilds;
 
 my $db = openHydraDB;
 
 my @sources = $db->sources;
 my $nrtables = scalar(@sources);
 
-use Test::Simple tests => 62;
+use Test::Simple tests => 74;
 
 foreach my $source (@sources) {
+  my $title = "Basic select query for $source";
   if( $source !~ m/^(LatestSucceeded|JobStatus|ActiveJobs)/) {
-    ok(scalar($db->resultset($source)->search({},{})) == 0, "Basic select query for $source");
+    ok(scalar($db->resultset($source)->all) == 0, $title);
+  } 
+  else {
+    ok(scalar($db->resultset($source)->search({},{ bind => ["", "", ""] })) == 0, $title);
   }
 }
+