diff --git a/chai-as-promised/chai-as-promised-tests.ts b/chai-as-promised/chai-as-promised-tests.ts
index 0b747d2c4..8685f953f 100644
--- a/chai-as-promised/chai-as-promised-tests.ts
+++ b/chai-as-promised/chai-as-promised-tests.ts
@@ -8,6 +8,8 @@ import Q = require('q');
 
 chai.use(chaiAsPromised);
 
+class TestClass {}
+
 // ReSharper disable WrongExpressionStatement
 // BDD API (expect)
 var thenableNum: PromisesAPlus.Thenable<number>;
@@ -17,6 +19,13 @@ thenableNum = chai.expect(thenableNum).to.become(3);
 thenableNum = chai.expect(thenableNum).to.be.fulfilled;
 thenableNum = chai.expect(thenableNum).to.be.rejected;
 thenableNum = chai.expect(thenableNum).to.be.rejectedWith(Error);
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith('Error');
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(/message/);
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(Error, /message/);
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(Error, 'message');
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(TestClass);
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(TestClass, /message/);
+thenableNum = chai.expect(thenableNum).to.be.rejectedWith(TestClass, 'message');
 thenableNum = chai.expect(thenableNum).to.notify(() => console.log('done'));
 
 // BDD API (should)
@@ -25,6 +34,13 @@ thenableNum = thenableNum.should.eventually.deep.equal(3);
 thenableNum = thenableNum.should.become(3);
 thenableNum = thenableNum.should.be.rejected;
 thenableNum = thenableNum.should.be.rejectedWith(Error);
+thenableNum = thenableNum.should.be.rejectedWith('Error');
+thenableNum = thenableNum.should.be.rejectedWith(/message/);
+thenableNum = thenableNum.should.be.rejectedWith(Error, /message/);
+thenableNum = thenableNum.should.be.rejectedWith(Error, 'message');
+thenableNum = thenableNum.should.be.rejectedWith(TestClass);
+thenableNum = thenableNum.should.be.rejectedWith(TestClass, /message/);
+thenableNum = thenableNum.should.be.rejectedWith(TestClass, 'message');
 thenableNum = thenableNum.should.eventually.equal(3).notify(() => console.log('done'));
 thenableNum = thenableNum.should.be.fulfilled.and.notify(() => console.log('done'));
 
diff --git a/chai-as-promised/chai-as-promised.d.ts b/chai-as-promised/chai-as-promised.d.ts
index d7f1472c7..36aa358f3 100644
--- a/chai-as-promised/chai-as-promised.d.ts
+++ b/chai-as-promised/chai-as-promised.d.ts
@@ -20,7 +20,7 @@ declare module Chai {
         become(expected: any): PromisedAssertion;
         fulfilled: PromisedAssertion;
         rejected: PromisedAssertion;
-        rejectedWith(expected: any, message?: string): PromisedAssertion;
+        rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
         notify(fn: Function): PromisedAssertion;
     }
 
@@ -30,7 +30,7 @@ declare module Chai {
         become(expected: PromisesAPlus.Thenable<any>): PromisedAssertion;
         fulfilled: PromisedAssertion;
         rejected: PromisedAssertion;
-        rejectedWith(expected: any): PromisedAssertion;
+        rejectedWith(expected: any, message?: string | RegExp): PromisedAssertion;
         notify(fn: Function): PromisedAssertion;
 
         // From chai