diff --git a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java
index 27ddd792ae..34e334ba13 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/ErrorIT.java
@@ -155,17 +155,17 @@ void shouldExplainConnectionError()
     void shouldHandleFailureAtRunTime()
     {
         String label = UUID.randomUUID().toString();  // avoid clashes with other tests
-
+        String query = "CREATE CONSTRAINT ON (a:`" + label + "`) ASSERT a.name IS UNIQUE";
         // given
         Transaction tx = session.beginTransaction();
-        tx.run( "CREATE CONSTRAINT ON (a:`" + label + "`) ASSERT a.name IS UNIQUE" );
+        tx.run( query );
         tx.commit();
 
         // and
         Transaction anotherTx = session.beginTransaction();
 
         // then expect
-        ClientException e = assertThrows( ClientException.class, () -> anotherTx.run( "CREATE INDEX ON :`" + label + "`(name)" ) );
+        ClientException e = assertThrows( ClientException.class, () -> anotherTx.run( query ) );
         anotherTx.rollback();
         assertThat( e.getMessage(), containsString( label ) );
         assertThat( e.getMessage(), containsString( "name" ) );
diff --git a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java
index bf455d4770..a264fc8750 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/SessionIT.java
@@ -770,9 +770,9 @@ void shouldThrowRunFailureImmediatelyAndCloseSuccessfully()
     {
         try ( Session session = neo4j.driver().session() )
         {
-            ClientException e = assertThrows( ClientException.class, () -> session.run( "RETURN 10 / 0" ) );
+            ClientException e = assertThrows( ClientException.class, () -> session.run( "RETURN 1 * \"x\"" ) );
 
-            assertThat( e.getMessage(), containsString( "/ by zero" ) );
+            assertThat( e.getMessage(), containsString( "Type mismatch" ) );
         }
     }
 
@@ -804,9 +804,10 @@ void shouldThrowRunFailureImmediatelyAfterMultipleSuccessfulRunsAndCloseSuccessf
         {
             session.run( "CREATE ()" );
             session.run( "CREATE ()" );
-            ClientException e = assertThrows( ClientException.class, () -> session.run( "RETURN 10 / 0" ) );
 
-            assertThat( e.getMessage(), containsString( "/ by zero" ) );
+            ClientException e = assertThrows( ClientException.class, () -> session.run( "RETURN 1 * \"x\"" ) );
+
+            assertThat( e.getMessage(), containsString( "Type mismatch" ) );
         }
     }
 
@@ -817,8 +818,8 @@ void shouldThrowRunFailureImmediatelyAndAcceptSubsequentRun()
         {
             session.run( "CREATE ()" );
             session.run( "CREATE ()" );
-            ClientException e = assertThrows( ClientException.class, () -> session.run( "RETURN 10 / 0" ) );
-            assertThat( e.getMessage(), containsString( "/ by zero" ) );
+            ClientException e = assertThrows( ClientException.class, () -> session.run( "RETURN 1 * \"x\"" ) );
+            assertThat( e.getMessage(), containsString( "Type mismatch" ) );
             session.run( "CREATE ()" );
         }
     }
diff --git a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java
index 6850ad223e..e9422d858f 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/SummaryIT.java
@@ -26,8 +26,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.neo4j.driver.Session;
 import org.neo4j.driver.Result;
+import org.neo4j.driver.Session;
 import org.neo4j.driver.Value;
 import org.neo4j.driver.Values;
 import org.neo4j.driver.internal.util.EnabledOnNeo4jWith;
@@ -35,8 +35,8 @@
 import org.neo4j.driver.summary.Notification;
 import org.neo4j.driver.summary.Plan;
 import org.neo4j.driver.summary.ProfiledPlan;
-import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.driver.summary.QueryType;
+import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.driver.util.DatabaseExtension;
 import org.neo4j.driver.util.ParallelizableIT;
 
@@ -125,12 +125,12 @@ void shouldContainCorrectStatistics()
         assertTrue( session.run( "CREATE (n {magic: 42})" ).consume().counters().containsUpdates() );
         assertThat( session.run( "MATCH (n:ALabel) REMOVE n:ALabel " ).consume().counters().labelsRemoved(), equalTo( 1 ) );
 
-        assertThat( session.run( "CREATE INDEX ON :ALabel(prop)" ).consume().counters().indexesAdded(), equalTo( 1 ) );
-        assertThat( session.run( "DROP INDEX ON :ALabel(prop)" ).consume().counters().indexesRemoved(), equalTo( 1 ) );
+        assertThat( session.run( "CREATE INDEX superIndex FOR (n:ALabel) ON (n.prop)" ).consume().counters().indexesAdded(), equalTo( 1 ) );
+        assertThat( session.run( "DROP INDEX superIndex" ).consume().counters().indexesRemoved(), equalTo( 1 ) );
 
-        assertThat( session.run( "CREATE CONSTRAINT ON (book:Book) ASSERT book.isbn IS UNIQUE" )
+        assertThat( session.run( "CREATE CONSTRAINT restrictedConstraint ON (book:Book) ASSERT book.isbn IS UNIQUE" )
                 .consume().counters().constraintsAdded(), equalTo( 1 ) );
-        assertThat( session.run( "DROP CONSTRAINT ON (book:Book) ASSERT book.isbn IS UNIQUE" )
+        assertThat( session.run( "DROP CONSTRAINT restrictedConstraint" )
                 .consume().counters().constraintsRemoved(), equalTo( 1 ) );
     }
 
diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java
index 942d534d7a..c53c97b68b 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncSessionIT.java
@@ -700,7 +700,7 @@ public CompletionStage<String> execute( AsyncTransaction tx )
     @Test
     void shouldNotPropagateRunFailureWhenClosed()
     {
-        session.runAsync( "RETURN 10 / 0" );
+        session.runAsync( "RETURN 1 * \"x\"" );
 
         await( session.closeAsync() );
     }
@@ -708,9 +708,9 @@ void shouldNotPropagateRunFailureWhenClosed()
     @Test
     void shouldPropagateRunFailureImmediately()
     {
-        ClientException e = assertThrows( ClientException.class, () -> await( session.runAsync( "RETURN 10 / 0" ) ) );
+        ClientException e = assertThrows( ClientException.class, () -> await( session.runAsync( "RETURN 1 * \"x\"" ) ) );
 
-        assertThat( e.getMessage(), containsString( "/ by zero" ) );
+        assertThat( e.getMessage(), containsString( "Type mismatch" ) );
     }
 
     @Test
diff --git a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java
index 16fa94fff3..7529f35df5 100644
--- a/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java
+++ b/driver/src/test/java/org/neo4j/driver/integration/async/AsyncTransactionIT.java
@@ -664,7 +664,7 @@ void shouldFailToCommitWhenQueriesFail()
 
         tx.runAsync( "CREATE (:TestNode)" );
         tx.runAsync( "CREATE (:TestNode)" );
-        tx.runAsync( "RETURN 10 / 0" );
+        tx.runAsync( "RETURN 1 * \"x\"" );
         tx.runAsync( "CREATE (:TestNode)" );
 
         ClientException e = assertThrows( ClientException.class, () -> await( tx.commitAsync() ) );
@@ -690,10 +690,10 @@ void shouldFailToCommitWhenBlockedRunFailed()
     {
         AsyncTransaction tx = await( session.beginTransactionAsync() );
 
-        ClientException runException = assertThrows( ClientException.class, () -> await( tx.runAsync( "RETURN 42 / 0" ) ) );
+        ClientException runException = assertThrows( ClientException.class, () -> await( tx.runAsync( "RETURN 1 * \"x\"" ) ) );
 
         ClientException commitException = assertThrows( ClientException.class, () -> await( tx.commitAsync() ) );
-        assertThat( runException.getMessage(), containsString( "/ by zero" ) );
+        assertThat( runException.getMessage(), containsString( "Type mismatch" ) );
         assertNoCircularReferences( commitException );
         assertThat( commitException.getMessage(), containsString( "Transaction can't be committed" ) );
     }
@@ -713,7 +713,7 @@ void shouldRollbackSuccessfullyWhenBlockedRunFailed()
     {
         AsyncTransaction tx = await( session.beginTransactionAsync() );
 
-        assertThrows( ClientException.class, () -> await( tx.runAsync( "RETURN 42 / 0" ) ) );
+        assertThrows( ClientException.class, () -> await( tx.runAsync( "RETURN 1 * \"x\"" ) ) );
 
         await( tx.rollbackAsync() );
     }