diff --git a/flow/e2e/test_utils.go b/flow/e2e/test_utils.go
index b4e15f1cfb..a72cc5272e 100644
--- a/flow/e2e/test_utils.go
+++ b/flow/e2e/test_utils.go
@@ -145,11 +145,13 @@ func EnvWaitForEqualTablesWithNames(
 
 		pgRows, err := GetPgRows(suite.Connector(), suite.Suffix(), srcTable, cols)
 		if err != nil {
+			t.Log(err)
 			return false
 		}
 
 		rows, err := suite.GetRows(dstTable, cols)
 		if err != nil {
+			t.Log(err)
 			return false
 		}
 
diff --git a/flow/model/qvalue/qvalue.go b/flow/model/qvalue/qvalue.go
index 972063d494..1d2713fdd6 100644
--- a/flow/model/qvalue/qvalue.go
+++ b/flow/model/qvalue/qvalue.go
@@ -271,6 +271,9 @@ func compareHstore(value1, value2 interface{}) bool {
 		}
 		return string(bytes) == str2
 	case string:
+		if v1 == str2 {
+			return true
+		}
 		parsedHStore1, err := hstore_util.ParseHstore(v1)
 		if err != nil {
 			panic(err)