diff --git a/index.js b/index.js
index 981e331fe2..c08b2370b5 100644
--- a/index.js
+++ b/index.js
@@ -1,18 +1,11 @@
 /*global Buffer require exports console setTimeout */
 
 var net = require("net"),
-    util,
+    util = require("./lib/util").util,
     events = require("events"),
     default_port = 6379,
     default_host = "127.0.0.1";
 
-// hilarious 0.2.x to 0.3.x API change
-try {
-    util = require("util");
-} catch (err) {
-    util = require("sys");
-}
-
 // can can set this to true to enable for all connections
 exports.debug_mode = false;
 
diff --git a/lib/util.js b/lib/util.js
new file mode 100644
index 0000000000..199a273c6a
--- /dev/null
+++ b/lib/util.js
@@ -0,0 +1,7 @@
+if (process.versions.node.match(/^0.3/)) {
+    exports.util = require("util");
+} else {
+    /* This module is called "sys" in 0.2.x */
+    exports.util = require("sys");
+}
+
diff --git a/test.js b/test.js
index 9a7a7bbb07..7d2430cc61 100644
--- a/test.js
+++ b/test.js
@@ -4,19 +4,13 @@ var redis = require("./index"),
     client2 = redis.createClient(),
     client3 = redis.createClient(),
     assert = require("assert"),
-    util,
+    util = require("./lib/util").util,
     test_db_num = 15, // this DB will be flushed and used for testing
     tests = {},
     connected = false,
     ended = false,
     server_info;
 
-try {
-    util = require("util");
-} catch (err) {
-    util = require("sys");
-}
-
 // Uncomment this to see the wire protocol and other debugging info
 //redis.debug_mode = true;