diff --git a/test/compliant/typeof.vcproj b/test/compliant/typeof.vcproj
index fa1fe6a..3b9fb01 100755
--- a/test/compliant/typeof.vcproj
+++ b/test/compliant/typeof.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="C:\boost\boost_1_32_0;..\..\..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_TYPEOF_COMPLIANT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
diff --git a/test/jamfile b/test/jamfile
deleted file mode 100755
index 85d1cd6..0000000
--- a/test/jamfile
+++ /dev/null
@@ -1,25 +0,0 @@
-project-root ;
-
-variant debug_native : debug ;
-variant release_native : release ;
-
-exe typeof 
-: 
-	main.cpp
-	compliant/test_compliant.cpp
-	compliant/odr1.cpp
-	compliant/odr2.cpp
-: 
-	<include>C:/boost/boost_1_32_0
-	<include>../../..
-	<gcc><debug><define>BOOST_TYPEOF_COMPLIANT
-	<gcc><release><define>BOOST_TYPEOF_COMPLIANT
-	<msvc><debug><define>BOOST_TYPEOF_VINTAGE
-	<msvc><release><define>BOOST_TYPEOF_VINTAGE
-	<vc-7><debug><define>BOOST_TYPEOF_VINTAGE
-	<vc-7><release><define>BOOST_TYPEOF_VINTAGE
-	<vc-7_1><debug><define>BOOST_TYPEOF_COMPLIANT
-	<vc-7_1><release><define>BOOST_TYPEOF_COMPLIANT
-:
-	debug debug_native
-;
diff --git a/test/jamrules b/test/jamrules
deleted file mode 100755
index e69de29..0000000
diff --git a/test/main.cpp b/test/main.cpp
index ab8bce8..aa731d7 100755
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -291,16 +291,16 @@ namespace test_integral
 
 BOOST_TYPEOF_REGISTER_TEMPLATE(test_integral::foo, 
                                (BOOST_TYPEOF_INTEGRAL(test_integral::E))
-                               );
+                               )
 
 BOOST_TYPEOF_REGISTER_TEMPLATE(test_integral::blah, 
                                (BOOST_TYPEOF_INTEGRAL(unsigned long int))
-                               );
+                               )
 
 BOOST_TYPEOF_REGISTER_TEMPLATE(test_integral::bar,
                                (class)
                                (BOOST_TYPEOF_INTEGRAL(P0))
-                               );
+                               )
 
 namespace test_integral
 {