diff --git a/lib/collection.js b/lib/collection.js
index b96382edda..5d1a1c6854 100644
--- a/lib/collection.js
+++ b/lib/collection.js
@@ -429,7 +429,7 @@ Collection.prototype.find = deprecateOptions(
     }
 
     // Translate to new command option noCursorTimeout
-    if (typeof newOptions.timeout === 'boolean') newOptions.noCursorTimeout = newOptions.timeout;
+    if (typeof newOptions.timeout === 'boolean') newOptions.noCursorTimeout = !newOptions.timeout;
 
     decorateCommand(findCommand, newOptions, ['session', 'collation']);
 
diff --git a/test/functional/find.test.js b/test/functional/find.test.js
index 2ca1ae61a2..08454c63dd 100644
--- a/test/functional/find.test.js
+++ b/test/functional/find.test.js
@@ -1195,19 +1195,23 @@ describe('Find', function() {
 
     // The actual test we wish to run
     test: function(done) {
-      var configuration = this.configuration;
-      var client = configuration.newClient(configuration.writeConcernMax(), { poolSize: 1 });
+      const configuration = this.configuration;
+      const client = configuration.newClient(configuration.writeConcernMax(), { poolSize: 1 });
       client.connect(function(err, client) {
-        var db = client.db(configuration.db);
+        const db = client.db(configuration.db);
         db.createCollection('timeoutFalse', function(err, collection) {
+          expect(err).to.not.exist;
           collection.find({}, { timeout: false }, function(err, cursor) {
-            test.equal(false, cursor.cmd.noCursorTimeout);
+            expect(err).to.not.exist;
+            expect(cursor.cmd.noCursorTimeout).to.be.true;
 
             collection.find({}, { timeout: true }, function(err, cursor) {
-              test.equal(true, cursor.cmd.noCursorTimeout);
+              expect(err).to.not.exist;
+              expect(cursor.cmd.noCursorTimeout).to.be.false;
 
               collection.find({}, {}, function(err, cursor) {
-                test.ok(!cursor.cmd.noCursorTimeout);
+                expect(err).to.not.exist;
+                expect(cursor.cmd.noCursorTimeout).to.not.exist;
 
                 client.close(done);
               });