diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java
index 5640799459..de4b9dd199 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/BaseTest4.java
@@ -109,6 +109,10 @@ public void assumeBinaryModeForce() {
     Assume.assumeTrue(preferQueryMode != PreferQueryMode.SIMPLE);
   }
 
+  public void assumeNotSimpleQueryMode() {
+    Assume.assumeTrue(preferQueryMode != PreferQueryMode.SIMPLE);
+  }
+
   /**
    * Shorthand for {@code Assume.assumeTrue(TestUtil.haveMinimumServerVersion(conn, version)}.
    */
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3CallableStatementTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3CallableStatementTest.java
index 822bdf8082..17cf45003b 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3CallableStatementTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc3/Jdbc3CallableStatementTest.java
@@ -395,6 +395,7 @@ public void testSetObjectBit() throws Throwable {
 
   @Test
   public void testGetBit1WithoutArg() throws SQLException {
+    assumeNotSimpleQueryMode();
     try (CallableStatement call = con.prepareCall("{ ? = call testspg__getBit1WithoutArg () }")) {
       call.registerOutParameter(1, Types.BOOLEAN);
       call.execute();
@@ -404,6 +405,7 @@ public void testGetBit1WithoutArg() throws SQLException {
 
   @Test
   public void testGetBit2WithoutArg() throws SQLException {
+    assumeNotSimpleQueryMode();
     try (CallableStatement call = con.prepareCall("{ ? = call testspg__getBit2WithoutArg () }")) {
       call.registerOutParameter(1, Types.BOOLEAN);
       try {
@@ -980,6 +982,7 @@ public void testGetBoolean01() throws Throwable {
 
   @Test
   public void testGetBooleanWithoutArg() throws SQLException {
+    assumeNotSimpleQueryMode();
     try (CallableStatement call = con.prepareCall("{ ? = call testspg__getBooleanWithoutArg () }")) {
       call.registerOutParameter(1, Types.BOOLEAN);
       call.execute();