diff --git a/.travis.yml b/.travis.yml
index 2111676..d7ed39c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,14 @@
 language: node_js
 node_js:
   - "0.10"
-  - iojs
+  - stable
+env:
+  # Can't figure out how to DRY this up: http://stackoverflow.com/q/22397300/3191
+  - CHAI_VERSION=^1.9.2 SINON_VERSION=^1.4.0
+  - CHAI_VERSION=^2.0.0 SINON_VERSION=^1.4.0
+  - CHAI_VERSION=^3.0.0 SINON_VERSION=^1.4.0
+  - CHAI_VERSION=^1.9.2 SINON_VERSION=^2.1.0
+  - CHAI_VERSION=^2.0.0 SINON_VERSION=^2.1.0
+  - CHAI_VERSION=^3.0.0 SINON_VERSION=^2.1.0
 script:
-  npm run lint && npm test
+  npm run lint && npm run test-travis
diff --git a/package.json b/package.json
index 4d298bd..7cb846c 100644
--- a/package.json
+++ b/package.json
@@ -22,16 +22,14 @@
     "lib"
   ],
   "scripts": {
-    "test": "npm run test-chai-1-9-2 && npm run test-chai-2-3-0 && npm run test-chai-3-0-0",
-    "test-chai-1-9-2": "npm install chai@1.9.2 && mocha",
-    "test-chai-2-3-0": "npm install chai@2.3.0 && mocha",
-    "test-chai-3-0-0": "npm install chai@3.0.0 && mocha",
+    "test": "mocha",
+    "test-travis": "npm install chai@$CHAI_VERSION && npm install sinon@$SINON_VERSION && npm test",
     "lint": "jshint ./lib",
     "cover": "istanbul cover node_modules/mocha/bin/_mocha && opener ./coverage/lcov-report/lib/sinon-chai.js.html"
   },
   "peerDependencies": {
     "chai": ">=1.9.2 <4",
-    "sinon": ">=1.4.0 <2"
+    "sinon": "^1.4.0 || ^2.1.0"
   },
   "devDependencies": {
     "chai": "^3.0.0",
@@ -40,6 +38,6 @@
     "jshint": "^2.5.6",
     "mocha": "^1.21.4",
     "opener": "^1.4.0",
-    "sinon": "^1.10.3"
+    "sinon": "^2.1.0"
   }
 }