diff --git a/package.json b/package.json
index 492eaeb1..74d29eac 100755
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
     "parse-tck": "babel-node test/helpers/tck/parseTck.js",
     "test-tck": "nyc ava --fail-fast test/tck/",
     "report-coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov",
-    "test-all": "nyc ava test/*.js test/neo4j-schema/*Test.js --verbose",
+    "test-all": "nyc ava test/ --verbose",
+    "test-isolated": "nyc ava test/ --verbose --match='!*not-isolated*'",
     "debug": "nodemon ./example/apollo-server/movies.js --exec babel-node --inspect-brk=9229 --nolazy",
     "debug-typedefs": "nodemon ./example/apollo-server/movies-typedefs.js --exec babel-node --inspect-brk=9229 --nolazy",
     "debug-interface": "nodemon ./example/apollo-server/interfaceError.js --exec babel-node --inspect-brk=9229 --nolazy"
diff --git a/test/integration.js b/test/integration/integration.js
similarity index 97%
rename from test/integration.js
rename to test/integration/integration.js
index 23f904a8..e02846fe 100644
--- a/test/integration.js
+++ b/test/integration/integration.js
@@ -172,7 +172,7 @@ test('Handle @cypher directive on QueryType', async t => {
     });
 });
 
-test('Mutation with @cypher directive', async t => {
+test('Mutation with @cypher directive (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -202,7 +202,7 @@ test('Mutation with @cypher directive', async t => {
     });
 });
 
-test('Create node mutation', async t => {
+test('Create node mutation (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -279,7 +279,7 @@ test('Update node mutation', async t => {
     });
 });
 
-test.serial('Add relationship mutation', async t => {
+test.serial('Add relationship mutation (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -348,7 +348,7 @@ test.serial('Add relationship mutation', async t => {
     });
 });
 
-test.serial('Remove relationship mutation', async t => {
+test.serial('Remove relationship mutation (not-isolated)', async t => {
   t.plan(1);
 
   await client
@@ -613,7 +613,7 @@ test('query using inine fragment', async t => {
  */
 
 // Temporal node property
-test.serial('Temporal - Create node with temporal property', async t => {
+test.serial('Temporal - Create node with temporal property (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -660,7 +660,7 @@ test.serial('Temporal - Create node with temporal property', async t => {
 });
 
 test.serial(
-  'Temporal - Create node with multiple temporal fields and input formats',
+  'Temporal - Create node with multiple temporal fields and input formats (not-isolated)',
   async t => {
     t.plan(1);
 
@@ -727,7 +727,7 @@ test.serial(
 );
 
 test.serial(
-  'Temporal - Create node with multiple temporal fields and input formats - with GraphQL variables',
+  'Temporal - Create node with multiple temporal fields and input formats - with GraphQL variables (not-isolated)',
   async t => {
     t.plan(1);
 
@@ -802,7 +802,7 @@ test.serial(
   }
 );
 
-test.serial('Temporal - Query node with temporal field', async t => {
+test.serial('Temporal - Query node with temporal field (not-isolated)', async t => {
   let expected = {
     data: {
       Movie: [
@@ -881,7 +881,7 @@ test.serial('Temporal - Query node with temporal field', async t => {
     });
 });
 
-test.serial('Temporal - create node with only a temporal property', async t => {
+test.serial('Temporal - create node with only a temporal property (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -916,7 +916,7 @@ test.serial('Temporal - create node with only a temporal property', async t => {
     });
 });
 
-test.serial('Temporal - temporal query argument, components', async t => {
+test.serial('Temporal - temporal query argument, components (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -953,7 +953,7 @@ test.serial('Temporal - temporal query argument, components', async t => {
     });
 });
 
-test.serial('Temporal - temporal query argument, formatted', async t => {
+test.serial('Temporal - temporal query argument, formatted (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -990,7 +990,7 @@ test.serial('Temporal - temporal query argument, formatted', async t => {
     });
 });
 
-test.serial('Add relationship with temporal property', async t => {
+test.serial('Add relationship with temporal property (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
@@ -1031,7 +1031,7 @@ test.serial('Add relationship with temporal property', async t => {
     });
 });
 
-test.serial('Query for temporal property on relationship', async t => {
+test.serial('Query for temporal property on relationship (not-isolated)', async t => {
   t.plan(1);
 
   let expected = {
diff --git a/test/test-middleware.js b/test/integration/test-middleware.test.js
similarity index 100%
rename from test/test-middleware.js
rename to test/integration/test-middleware.test.js