diff --git a/test/manipulation.test.js b/test/manipulation.test.js
index 0aece801..1a5a583d 100644
--- a/test/manipulation.test.js
+++ b/test/manipulation.test.js
@@ -658,6 +658,17 @@ describe('manipulation', function() {
   });
 
   describe('updateOrCreate', function() {
+    var ds = getSchema();
+    var Post;
+
+    before('prepare "Post" model', function(done) {
+      Post = ds.define('Post', {
+        title: { type: String, id: true },
+        content: { type: String },
+      });
+      ds.automigrate('Post', done);
+    });
+
     it('has an alias "patchOrCreate"', function() {
       StubUser.updateOrCreate.should.equal(StubUser.patchOrCreate);
     });
@@ -716,6 +727,37 @@ describe('manipulation', function() {
         });
     });
 
+    it('updates specific instances when PK is not an auto-generated id', function(done) {
+      Post.create([
+        { title: 'postA', content: 'contentA' },
+        { title: 'postB', content: 'contentB' },
+      ], function(err, instance) {
+        if (err) return done(err);
+
+        Post.updateOrCreate({
+          title: 'postA', content: 'newContent',
+        }, function(err, instance) {
+          if (err) return done(err);
+
+          var result = instance.toObject();
+          result.should.have.properties({
+            title: 'postA',
+            content: 'newContent',
+          });
+          Post.find(function(err, posts) {
+            if (err) return done(err);
+
+            posts.should.have.length(2);
+            posts[0].title.should.equal('postA');
+            posts[0].content.should.equal('newContent');
+            posts[1].title.should.equal('postB');
+            posts[1].content.should.equal('contentB');
+            done();
+          });
+        });
+      });
+    });
+
     it('should allow save() of the created instance', function(done) {
       Person.updateOrCreate(
         { id: 999 /* a new id */, name: 'a-name' },