diff --git a/tests/make-tests/make-ens.py b/tests/make-tests/make-namehash.py
similarity index 100%
rename from tests/make-tests/make-ens.py
rename to tests/make-tests/make-namehash.py
diff --git a/tests/run-utils.js b/tests/run-utils.js
index 3e815a2b2..15743a0b9 100644
--- a/tests/run-utils.js
+++ b/tests/run-utils.js
@@ -90,9 +90,20 @@ function testUnits(test) {
     test.done();
 }
 
+function testNamehash(test) {
+    var namehash = require('../utils/namehash');
+
+    var testcases = require('./tests/ens.json');
+    testcases.forEach(function(testcase) {
+        test.equal(namehash(testcase.name), testcase.expected, 'namehash(' + testcase.name + ')');
+    });
+    test.done();
+}
+
 module.exports = {
     "address": testAddress,
     "contract-address": testContractAddress,
+    'namehash': testNamehash,
     "rlp-coder": testRLPCoder,
     "units": testUnits,
 }