diff --git a/test/date_format-test.js b/test/date_format-test.js
index 6085843..de2c546 100644
--- a/test/date_format-test.js
+++ b/test/date_format-test.js
@@ -1,51 +1,32 @@
 "use strict";
-var vows = require('vows')
-, assert = require('assert')
+var should = require('should')
 , dateFormat = require('../lib/date_format');
 
-vows.describe('date_format').addBatch({
-  'Date extensions': {
-    topic: function() {
-      return new Date(2010, 0, 11, 14, 31, 30, 5);
-    },
-    'should format a date as string using a pattern': function(date) {
-      assert.equal(
-        dateFormat.asString(dateFormat.DATETIME_FORMAT, date),
-        "11 01 2010 14:31:30.005"
-      );
-    },
-    'should default to the ISO8601 format': function(date) {
-      assert.equal(
-        dateFormat.asString(date),
-        '2010-01-11 14:31:30.005'
-      );
-    },
-    'should provide a ISO8601 with timezone offset format': function(date) {
-      date.getTimezoneOffset = function() { return -660; };
-      assert.equal(
-        dateFormat.asString(dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT, date),
-        "2010-01-11T14:31:30+1100"
-      );
+describe('date_format', function() {
+  var date = new Date(2010, 0, 11, 14, 31, 30, 5);
 
-      date.getTimezoneOffset = function() { return 120; };
-      assert.equal(
-        dateFormat.asString(dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT, date),
-        "2010-01-11T14:31:30-0200"
-      );
+  it('should format a date as string using a pattern', function() {
+    dateFormat.asString(dateFormat.DATETIME_FORMAT, date).should.eql("11 01 2010 14:31:30.005");
+  });
 
-    },
-    'should provide a just-the-time format': function(date) {
-      assert.equal(
-        dateFormat.asString(dateFormat.ABSOLUTETIME_FORMAT, date),
-        '14:31:30.005'
-      );
-    },
-    'should provide a custom format': function(date) {
-      date.getTimezoneOffset = function() { return 120; };
-      assert.equal(
-        dateFormat.asString("O.SSS.ss.mm.hh.dd.MM.yy", date),
-        '-0200.005.30.31.14.11.01.10'
-      );
-    }
-  }
-}).export(module);
+  it('should default to the ISO8601 format', function() {
+    dateFormat.asString(date).should.eql('2010-01-11 14:31:30.005');
+  });
+
+  it('should provide a ISO8601 with timezone offset format', function() {
+    date.getTimezoneOffset = function() { return -660; };
+    dateFormat.asString(dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT, date).should.eql("2010-01-11T14:31:30+1100");
+
+    date.getTimezoneOffset = function() { return 120; };
+    dateFormat.asString(dateFormat.ISO8601_WITH_TZ_OFFSET_FORMAT, date).should.eql("2010-01-11T14:31:30-0200");
+  });
+
+  it('should provide a just-the-time format', function() {
+    dateFormat.asString(dateFormat.ABSOLUTETIME_FORMAT, date).should.eql('14:31:30.005');
+  });
+
+  it('should provide a custom format', function() {
+    date.getTimezoneOffset = function() { return 120; };
+    dateFormat.asString("O.SSS.ss.mm.hh.dd.MM.yy", date).should.eql('-0200.005.30.31.14.11.01.10');
+  });
+});