diff --git a/test/test-ccnx-name.cpp b/test/test-ccnx-name.cc
similarity index 79%
rename from test/test-ccnx-name.cpp
rename to test/test-ccnx-name.cc
index 1695cc8..abab747 100644
--- a/test/test-ccnx-name.cpp
+++ b/test/test-ccnx-name.cc
@@ -1,11 +1,15 @@
-#include <boost/test/unit_test.hpp>
+
 #include "ccnx-name.h"
+
+#define BOOST_TEST_MAIN 1
+// #define BOOST_TEST_DYN_LINK
+// #define BOOST_TEST_Module Main
+
+#include <boost/test/unit_test.hpp>
+
 using namespace Ccnx;
 using namespace std;
 using namespace boost;
-//#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_Module Main
 
 BOOST_AUTO_TEST_SUITE(CcnxNameTests)
 
diff --git a/wscript b/wscript
index c1231b1..736c5d1 100644
--- a/wscript
+++ b/wscript
@@ -49,7 +49,7 @@
         conf.env.append_value('CXXFLAGS', ['-O3', '-g'])
 
     if conf.options._test:
-      conf.define('_TEST', 1)
+        conf.env.TEST = 1
 
     conf.load('protoc')
     conf.load('ice_cxx')
@@ -73,7 +73,7 @@
         )
 
     # Unit tests
-    if bld.get_define("_TEST"):
+    if bld.env['TEST']:
       unittests = bld.program (
           target="unit-tests",
           source = bld.path.ant_glob(['test/**/*.cc']),