diff --git a/query_test.go b/query_test.go
index 51ca36de..466e80ae 100644
--- a/query_test.go
+++ b/query_test.go
@@ -1900,6 +1900,10 @@ func TestConnSimpleProtocolRefusesNonStandardConformingStrings(t *testing.T) {
 	conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
 	defer closeConn(t, conn)
 
+	if conn.PgConn().ParameterStatus("crdb_version") != "" {
+		t.Skip("Server does not support standard_conforming_strings = off (https://github.com/cockroachdb/cockroach/issues/36215)")
+	}
+
 	mustExec(t, conn, "set standard_conforming_strings to off")
 
 	var expected string