diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index b22477565b53de29d8c65f0ce0a2ef3fa1e68d28..b87f1ebc021b794fda853cb4c2bc897437f9f66d 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -529,6 +529,15 @@ TEST(test_transaction, test_query) {
   EXPECT_EQ(query_transaction->GetResultSet().Size(), 1);
   EXPECT_EQ(query_transaction->GetResultSet().At(0).GetId(),
             new_entity.GetId());
+  // No count query, so no count result should be present
+  EXPECT_TRUE((query_transaction->GetCountResult() < 0));
+
+  auto count_query_trans(connection->CreateTransaction());
+  count_query_trans->Query("COUNT ENTITY WITH id = " + new_entity.GetId());
+  count_query_trans->Execute();
+  // No result set in a count query
+  EXPECT_EQ(count_query_trans->GetResultSet().Size(), 0);
+  EXPECT_EQ(count_query_trans->GetCountResult(), 1);
 }
 
 // TODO(fspreck) Add tests for unique queries, count queries, and mixed