diff --git a/stdlib/sql_test.go b/stdlib/sql_test.go
index 4378f3af..91dc2a8f 100644
--- a/stdlib/sql_test.go
+++ b/stdlib/sql_test.go
@@ -277,6 +277,16 @@ func TestConnQuery(t *testing.T) {
 	}
 }
 
+func TestConnQueryFailure(t *testing.T) {
+	db := openDB(t)
+	defer closeDB(t, db)
+
+	_, err := db.Query("select 'foo")
+	if _, ok := err.(pgx.PgError); !ok {
+		t.Fatalf("Expected db.Query to return pgx.PgError, but instead received: %v", err)
+	}
+}
+
 func TestTransactionLifeCycle(t *testing.T) {
 	db := openDB(t)
 	defer closeDB(t, db)