diff --git a/core/test/unit/client_ghostdown_spec.js b/core/test/unit/client_ghostdown_spec.js
index d2bffcd2ad..7725cc16a6 100644
--- a/core/test/unit/client_ghostdown_spec.js
+++ b/core/test/unit/client_ghostdown_spec.js
@@ -17,15 +17,15 @@ describe("Ghostdown showdown extensions", function () {
 
     it("should export an array of methods for processing", function () {
 
-        ghostdown.should.be.a("function");
+        ghostdown.should.be.a.function;
         ghostdown().should.be.an.instanceof(Array);
 
         ghostdown().forEach(function (processor) {
-            processor.should.be.a("object");
+            processor.should.be.an.Object;
             processor.should.have.property("type");
             processor.should.have.property("filter");
-            processor.type.should.be.a("string");
-            processor.filter.should.be.a("function");
+            processor.type.should.be.a.String;
+            processor.filter.should.be.a.function;
         });
     });
 
@@ -73,4 +73,4 @@ describe("Ghostdown showdown extensions", function () {
                 processedMarkup.should.match(/<img class="js-upload-target"/);
             });
     });
-});
\ No newline at end of file
+});
diff --git a/core/test/unit/mail_spec.js b/core/test/unit/mail_spec.js
index 151cf7f495..9b2bda66f6 100644
--- a/core/test/unit/mail_spec.js
+++ b/core/test/unit/mail_spec.js
@@ -76,7 +76,7 @@ describe("Mail", function () {
         should.exist(ghost.mail);
         ghost.mail.should.have.property('init');
         ghost.mail.should.have.property('transport');
-        ghost.mail.should.have.property('send').and.be.a('function');
+        ghost.mail.should.have.property('send').and.be.a.function;
     });
 
     it('should setup SMTP transport on initialization', function (done) {
@@ -84,7 +84,7 @@ describe("Mail", function () {
         ghost.mail.init(ghost).then(function(){
             ghost.mail.should.have.property('transport');
             ghost.mail.transport.transportType.should.eql('SMTP');
-            ghost.mail.transport.sendMail.should.be.a('function');
+            ghost.mail.transport.sendMail.should.be.a.function;
             done();
         }).then(null, done);
     });
@@ -94,7 +94,7 @@ describe("Mail", function () {
         ghost.mail.init(ghost).then(function(){
             ghost.mail.should.have.property('transport');
             ghost.mail.transport.transportType.should.eql('SENDMAIL');
-            ghost.mail.transport.sendMail.should.be.a('function');
+            ghost.mail.transport.sendMail.should.be.a.function;
             done();
         }).then(null, done);
     });
diff --git a/core/test/unit/model_posts_spec.js b/core/test/unit/model_posts_spec.js
index ad6671d01c..28b50493f7 100644
--- a/core/test/unit/model_posts_spec.js
+++ b/core/test/unit/model_posts_spec.js
@@ -73,8 +73,8 @@ describe('Post Model', function () {
             results.length.should.be.above(0);
             firstPost = results.models[0].toJSON();
 
-            firstPost.author.should.be.a('object');
-            firstPost.user.should.be.a('object');
+            firstPost.author.should.be.an.Object;
+            firstPost.user.should.be.an.Object;
             firstPost.author.name.should.equal(DataGenerator.Content.users[0].name);
             firstPost.user.name.should.equal(DataGenerator.Content.users[0].name);
 
@@ -89,8 +89,8 @@ describe('Post Model', function () {
             should.exist(result);
             firstPost = result.toJSON();
 
-            firstPost.author.should.be.a('object');
-            firstPost.user.should.be.a('object');
+            firstPost.author.should.be.an.Object;
+            firstPost.user.should.be.an.Object;
             firstPost.author.name.should.equal(testUtils.DataGenerator.Content.users[0].name);
             firstPost.user.name.should.equal(testUtils.DataGenerator.Content.users[0].name);
 
diff --git a/core/test/unit/model_tags_spec.js b/core/test/unit/model_tags_spec.js
index a0a235ed38..00dade6316 100644
--- a/core/test/unit/model_tags_spec.js
+++ b/core/test/unit/model_tags_spec.js
@@ -83,7 +83,7 @@ describe('Tag Model', function () {
             }).then(function () {
                 return PostModel.read({id: createdPostID, status: 'all'}, { withRelated: ['tags']});
             }).then(function (postWithoutTag) {
-                postWithoutTag.related('tags').should.be.empty;
+                postWithoutTag.related('tags').length.should.equal(0);
                 done();
             }).then(null, done);
         });
diff --git a/core/test/unit/shared_gfm_spec.js b/core/test/unit/shared_gfm_spec.js
index 1f7699f790..211d16e0f0 100644
--- a/core/test/unit/shared_gfm_spec.js
+++ b/core/test/unit/shared_gfm_spec.js
@@ -30,13 +30,13 @@ function _ConvertPhrase(testPhrase) {
 describe("Github showdown extensions", function () {
 
     it("should export an array of methods for processing", function () {
-        github.should.be.a("function");
-        github().should.be.an.instanceof(Array);
+        github.should.be.a.function;
+        github().should.be.an.Array;
 
         github().forEach(function (processor) {
-            processor.should.be.a("object");
+            processor.should.be.an.Object;
             processor.should.have.property("type");
-            processor.type.should.be.a("string");
+            processor.type.should.be.a.String;
         });
 
     });
@@ -267,4 +267,4 @@ describe("Github showdown extensions", function () {
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/package.json b/package.json
index d2694b4eeb..4fe2c6a054 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
         "grunt-open": "~0.2.2",
         "matchdep": "~0.1.2",
         "sinon": "~1.7.3",
-        "should": "~1.2.2",
+        "should": "~2.0.2",
         "mocha": "~1.12.0"
     }
 }