diff --git a/index.js b/index.js
index 9ba5f4610c..7ac120cde9 100644
--- a/index.js
+++ b/index.js
@@ -1,8 +1,8 @@
 /*global Buffer require exports console setTimeout */
 
 var net = require("net"),
-    util = require("./lib/util").util,
-    Queue = require("./lib/queue").Queue,
+    util = require("./lib/util"),
+    Queue = require("./lib/queue"),
     to_array = require("./lib/to_array"),
     events = require("events"),
     parsers = [], commands,
diff --git a/lib/parser/hiredis.js b/lib/parser/hiredis.js
index e7db7433f7..cbb15ba387 100644
--- a/lib/parser/hiredis.js
+++ b/lib/parser/hiredis.js
@@ -1,7 +1,7 @@
 /*global Buffer require exports console setTimeout */
 
 var events = require("events"),
-    util = require("../util").util,
+    util = require("../util"),
     hiredis = require("hiredis");
 
 exports.debug_mode = false;
diff --git a/lib/parser/javascript.js b/lib/parser/javascript.js
index f90bcc672f..b8f5bc6829 100644
--- a/lib/parser/javascript.js
+++ b/lib/parser/javascript.js
@@ -6,7 +6,7 @@
 //    use numbers for parser state
 
 var events = require("events"),
-    util = require("../util").util;
+    util = require("../util");
 
 exports.debug_mode = false;
 exports.name = "javascript";
diff --git a/lib/queue.js b/lib/queue.js
index 61587b4e51..56254e1ca4 100644
--- a/lib/queue.js
+++ b/lib/queue.js
@@ -55,4 +55,7 @@ Object.defineProperty(Queue.prototype, 'length', {
     }
 });
 
-exports.Queue = Queue;
+
+if(typeof module !== 'undefined' && module.exports) {
+  module.exports = Queue;
+}
diff --git a/lib/util.js b/lib/util.js
index 632631cca2..599c97af66 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -1,7 +1,7 @@
 // Support for very old versions of node.  At some point, we should abandon this.
 var minor = process.versions.node.split('.')[1];
 if (minor > 2) {
-    exports.util = require("util");
+    module.exports = require("util");
 } else {
-    exports.util = require("sys");
+    module.exports = require("sys");
 }
diff --git a/test.js b/test.js
index baa2136450..cd02160e7a 100644
--- a/test.js
+++ b/test.js
@@ -6,7 +6,7 @@ var redis = require("./index"),
     client4 = redis.createClient(9006, "filefish.redistogo.com"),
     client5 = redis.createClient(),
     assert = require("assert"),
-    util = require("./lib/util").util,
+    util = require("./lib/util"),
     test_db_num = 15, // this DB will be flushed and used for testing
     tests = {},
     connected = false,