diff --git a/Makefile b/Makefile
index 6f19912..18140b4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ $(ADDON): src/*.cc
 	node-waf configure build
 
 test: $(ADDON)
-	@./node_modules/.bin/expresso \
+	@./node_modules/.bin/mocha \
+		--ui exports \
+		--require should \
 		test/*.test.js
 
 test-server: $(ADDON)
diff --git a/package.json b/package.json
index 20b0afb..e96b4a4 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,9 @@
  }
  , "devDependencies": {
      "express": "2.3.7"
-   , "expresso": "0.7.6"
    , "jade": "0.11.0"
+   , "mocha": "*"
+   , "should": "*"
  }
  , "engines": { "node": ">= 0.4.0 && < 0.7.0" }
  , "main": "./lib/canvas.js"
diff --git a/test/canvas.test.js b/test/canvas.test.js
index de1b6e5..7dc87a3 100644
--- a/test/canvas.test.js
+++ b/test/canvas.test.js
@@ -16,11 +16,11 @@ console.log('   cairo: %s', Canvas.cairoVersion);
 
 module.exports = {
   'test .version': function(){
-    assert.match(Canvas.version, /^\d+\.\d+\.\d+$/);
+    Canvas.version.should.match(/^\d+\.\d+\.\d+$/);
   },
   
   'test .cairoVersion': function(){
-    assert.match(Canvas.cairoVersion, /^\d+\.\d+\.\d+$/);
+    Canvas.cairoVersion.should.match(/^\d+\.\d+\.\d+$/);
   },
   
   'test .parseFont()': function(){
@@ -72,13 +72,10 @@ module.exports = {
     for (var i = 0, len = tests.length; i < len; ++i) {
       var str = tests[i++]
         , obj = tests[i]
-        , got = parseFont(str);
+        , actual = parseFont(str);
       if (!obj.style) obj.style = 'normal';
       if (!obj.weight) obj.weight = 'normal';
-      assert.eql(obj, got, ''
-        + '\n   from: ' + sys.inspect(str)
-        + '\n   got:\n' + sys.inspect(got) 
-        + '\n   expected:\n' + sys.inspect(obj));
+      actual.should.eql(obj);
     }
   },
   
diff --git a/test/image.test.js b/test/image.test.js
index 9346f2e..3d76f2c 100644
--- a/test/image.test.js
+++ b/test/image.test.js
@@ -14,7 +14,7 @@ module.exports = {
     assert.ok(Image instanceof Function);
   },
 
-  'test Image#onload': function(beforeExit){
+  'test Image#onload': function(){
     var img = new Image
       , n = 0;
 
@@ -27,16 +27,14 @@ module.exports = {
     img.src = png;
     assert.equal(img.src, png);
 
-    beforeExit(function(){
-      assert.equal(img.src, png);
-      assert.strictEqual(true, img.complete);
-      assert.strictEqual(320, img.width);
-      assert.strictEqual(320, img.height);
-      assert.equal(1, n);
-    });
+    assert.equal(img.src, png);
+    assert.strictEqual(true, img.complete);
+    assert.strictEqual(320, img.width);
+    assert.strictEqual(320, img.height);
+    assert.equal(1, n);
   },
   
-  'test Image#onerror': function(beforeExit){
+  'test Image#onerror': function(){
     var img = new Image
       , error
       , n = 0;
@@ -59,14 +57,12 @@ module.exports = {
 
     assert.equal(img.src, png + 's');
 
-    beforeExit(function(){
-      assert.ok(error instanceof Error, 'did not invoke onerror() with error');
-      assert.strictEqual(false, img.complete);
-      assert.equal(1, n);
-    });
+    assert.ok(error instanceof Error, 'did not invoke onerror() with error');
+    assert.strictEqual(false, img.complete);
+    assert.equal(1, n);
   },
   
-  'test Image#{width,height}': function(beforeExit){
+  'test Image#{width,height}': function(){
     var img = new Image
       , n = 0;
     
@@ -79,8 +75,6 @@ module.exports = {
     };
     img.src = png;
 
-    beforeExit(function(){
-      assert.equal(1, n);
-    });
+    assert.equal(1, n);
   }
 };
\ No newline at end of file