diff --git a/test/client/query.js b/test/client/query.js
index 9a8f6a48..2fb2b205 100644
--- a/test/client/query.js
+++ b/test/client/query.js
@@ -172,5 +172,43 @@ module.exports = function(options) {
         });
       });
     });
+
+    it('snapshot fetch from query does not advance version of doc with pending ops', function(done) {
+      var backend = this.backend;
+      backend.connect(null, null, function(connection1) {
+        backend.connect(null, null, function(connection2) {
+          var doc = connection1.get('dogs', 'fido');
+          var doc2 = connection2.get('dogs', 'fido');
+          doc.create({name: 'kido'}, function(err) {
+            if (err) return done(err);
+            doc2.fetch(function(err) {
+              if (err) return done(err);
+              doc2.submitOp({p: ['name', 0], si: 'f'}, function(err) {
+                if (err) return done(err);
+                expect(doc2.data).eql({name: 'fkido'});
+                doc.connection.createFetchQuery('dogs', {}, null, function(err) {
+                  if (err) return done(err);
+                  doc.resume();
+                });
+              });
+            });
+          });
+          process.nextTick(function() {
+            doc.pause();
+            doc.submitOp({p: ['name', 0], sd: 'k'}, function(err) {
+              if (err) return done(err);
+              doc.pause();
+              doc2.fetch(function(err) {
+                if (err) return done(err);
+                expect(doc2.version).equal(3);
+                expect(doc2.data).eql({name: 'fido'});
+                done();
+              });
+            });
+            doc.del();
+          });
+        });
+      });
+    });
   });
 };
diff --git a/test/client/submit.js b/test/client/submit.js
index 819d47b2..8fa09893 100644
--- a/test/client/submit.js
+++ b/test/client/submit.js
@@ -929,44 +929,6 @@ module.exports = function() {
       });
     });
 
-    it('snapshot fetch from query does not advance version of doc with pending ops', function(done) {
-      var backend = this.backend;
-      backend.connect(null, null, function(connection1) {
-        backend.connect(null, null, function(connection2) {
-          var doc = connection1.get('dogs', id);
-          var doc2 = connection2.get('dogs', id);
-          doc.create({name: 'kido'}, function(err) {
-            if (err) return done(err);
-            doc2.fetch(function(err) {
-              if (err) return done(err);
-              doc2.submitOp({p: ['name', 0], si: 'f'}, function(err) {
-                if (err) return done(err);
-                expect(doc2.data).eql({name: 'fkido'});
-                doc.connection.createFetchQuery('dogs', {}, null, function(err) {
-                  if (err) return done(err);
-                  doc.resume();
-                });
-              });
-            });
-          });
-          process.nextTick(function() {
-            doc.pause();
-            doc.submitOp({p: ['name', 0], sd: 'k'}, function(err) {
-              if (err) return done(err);
-              doc.pause();
-              doc2.fetch(function(err) {
-                if (err) return done(err);
-                expect(doc2.version).equal(3);
-                expect(doc2.data).eql({name: 'fido'});
-                done();
-              });
-            });
-            doc.del();
-          });
-        });
-      });
-    });
-
     it('passing an error in submit middleware rejects a create and calls back with the erorr', function(done) {
       this.backend.use('submit', function(request, next) {
         next({message: 'Custom error'});
diff --git a/test/db.js b/test/db.js
index 1f6276f7..5fc8a293 100644
--- a/test/db.js
+++ b/test/db.js
@@ -61,9 +61,9 @@ module.exports = function(options) {
     if (options.getQuery) {
       require('./client/query-subscribe')({getQuery: options.getQuery});
       require('./client/query')({getQuery: options.getQuery});
+      require('./client/projections')({getQuery: options.getQuery});
     }
 
-    require('./client/projections')({getQuery: options.getQuery});
     require('./client/submit')();
     require('./client/submit-json1')();
     require('./client/subscribe')();
@@ -650,111 +650,111 @@ module.exports = function(options) {
       });
     });
 
-    describe('query', function() {
-      it('query returns data in the collection', function(done) {
-        var snapshot = {v: 1, type: 'json0', data: {x: 5, y: 6}, m: null};
-        var db = this.db;
-        db.commit('testcollection', 'test', {v: 0, create: {}}, snapshot, null, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, null, null, function(err, results) {
+    if (options.getQuery) {
+      describe('query', function() {
+        it('query returns data in the collection', function(done) {
+          var snapshot = {v: 1, type: 'json0', data: {x: 5, y: 6}, m: null};
+          var db = this.db;
+          db.commit('testcollection', 'test', {v: 0, create: {}}, snapshot, null, function(err) {
             if (err) return done(err);
-            delete results[0].id;
-            expect(results).eql([snapshot]);
-            done();
+            db.query('testcollection', {x: 5}, null, null, function(err, results) {
+              if (err) return done(err);
+              delete results[0].id;
+              expect(results).eql([snapshot]);
+              done();
+            });
           });
         });
-      });
 
-      it('query returns nothing when there is no data', function(done) {
-        this.db.query('testcollection', {x: 5}, null, null, function(err, results) {
-          if (err) return done(err);
-          expect(results).eql([]);
-          done();
+        it('query returns nothing when there is no data', function(done) {
+          this.db.query('testcollection', {x: 5}, null, null, function(err, results) {
+            if (err) return done(err);
+            expect(results).eql([]);
+            done();
+          });
         });
-      });
 
-      it('query does not return committed metadata by default', function(done) {
-        var db = this.db;
-        commitSnapshotWithMetadata(db, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, null, null, function(err, results) {
+        it('query does not return committed metadata by default', function(done) {
+          var db = this.db;
+          commitSnapshotWithMetadata(db, function(err) {
             if (err) return done(err);
-            expect(results[0].m).equal(null);
-            done();
+            db.query('testcollection', {x: 5}, null, null, function(err, results) {
+              if (err) return done(err);
+              expect(results[0].m).equal(null);
+              done();
+            });
           });
         });
-      });
 
-      it('query returns metadata when option is true', function(done) {
-        var db = this.db;
-        commitSnapshotWithMetadata(db, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, null, {metadata: true}, function(err, results) {
+        it('query returns metadata when option is true', function(done) {
+          var db = this.db;
+          commitSnapshotWithMetadata(db, function(err) {
             if (err) return done(err);
-            expect(results[0].m).eql({test: 3});
-            done();
+            db.query('testcollection', {x: 5}, null, {metadata: true}, function(err, results) {
+              if (err) return done(err);
+              expect(results[0].m).eql({test: 3});
+              done();
+            });
           });
         });
       });
-    });
 
-    describe('projections', function() {
-      it('query returns only projected fields', function(done) {
-        if (!this.db.projectsSnapshot) return done();
+      describe('projections', function() {
+        it('query returns only projected fields', function(done) {
+          if (!this.db.projectsSnapshot) return done();
 
-        var snapshot = {type: 'json0', v: 1, data: {x: 5, y: 6}};
-        var db = this.db;
-        db.commit('testcollection', 'test', {v: 0, create: {}}, snapshot, null, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, {y: true}, null, function(err, results) {
+          var snapshot = {type: 'json0', v: 1, data: {x: 5, y: 6}};
+          var db = this.db;
+          db.commit('testcollection', 'test', {v: 0, create: {}}, snapshot, null, function(err) {
             if (err) return done(err);
-            expect(results).eql([{type: 'json0', v: 1, data: {y: 6}, id: 'test'}]);
-            done();
+            db.query('testcollection', {x: 5}, {y: true}, null, function(err, results) {
+              if (err) return done(err);
+              expect(results).eql([{type: 'json0', v: 1, data: {y: 6}, id: 'test'}]);
+              done();
+            });
           });
         });
-      });
 
-      it('query returns no data for matching documents if fields is empty', function(done) {
-        if (!this.db.projectsSnapshot) return done();
+        it('query returns no data for matching documents if fields is empty', function(done) {
+          if (!this.db.projectsSnapshot) return done();
 
-        var snapshot = {type: 'json0', v: 1, data: {x: 5, y: 6}};
-        var db = this.db;
-        db.commit('testcollection', 'test', {v: 0, create: {}}, snapshot, null, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, {}, null, function(err, results) {
+          var snapshot = {type: 'json0', v: 1, data: {x: 5, y: 6}};
+          var db = this.db;
+          db.commit('testcollection', 'test', {v: 0, create: {}}, snapshot, null, function(err) {
             if (err) return done(err);
-            expect(results).eql([{type: 'json0', v: 1, data: {}, id: 'test'}]);
-            done();
+            db.query('testcollection', {x: 5}, {}, null, function(err, results) {
+              if (err) return done(err);
+              expect(results).eql([{type: 'json0', v: 1, data: {}, id: 'test'}]);
+              done();
+            });
           });
         });
-      });
 
-      it('query does not return committed metadata by default with projection', function(done) {
-        var db = this.db;
-        commitSnapshotWithMetadata(db, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, {x: true}, null, function(err, results) {
+        it('query does not return committed metadata by default with projection', function(done) {
+          var db = this.db;
+          commitSnapshotWithMetadata(db, function(err) {
             if (err) return done(err);
-            expect(results[0].m).equal(null);
-            done();
+            db.query('testcollection', {x: 5}, {x: true}, null, function(err, results) {
+              if (err) return done(err);
+              expect(results[0].m).equal(null);
+              done();
+            });
           });
         });
-      });
 
-      it('query returns metadata when option is true with projection', function(done) {
-        var db = this.db;
-        commitSnapshotWithMetadata(db, function(err) {
-          if (err) return done(err);
-          db.query('testcollection', {x: 5}, {x: true}, {metadata: true}, function(err, results) {
+        it('query returns metadata when option is true with projection', function(done) {
+          var db = this.db;
+          commitSnapshotWithMetadata(db, function(err) {
             if (err) return done(err);
-            expect(results[0].m).eql({test: 3});
-            done();
+            db.query('testcollection', {x: 5}, {x: true}, {metadata: true}, function(err, results) {
+              if (err) return done(err);
+              expect(results[0].m).eql({test: 3});
+              done();
+            });
           });
         });
       });
-    });
 
-    if (options.getQuery) {
       describe('queryPoll', function() {
         it('returns data in the collection', function(done) {
           var snapshot = {v: 1, type: 'json0', data: {x: 5, y: 6}};