diff --git a/src/bindings/cpp/SConscript b/src/bindings/cpp/SConscript
index bd9a90e..01345a7 100644
--- a/src/bindings/cpp/SConscript
+++ b/src/bindings/cpp/SConscript
@@ -1,5 +1,6 @@
 # -*- python -*-
-Import("env libhammer_shared")
+import os.path
+Import("env libhammer_shared testruns targets")
 
 cppenv = env.Clone()
 cppenv.Append(CPPPATH=[".", "vendor/gtest-1.7.0/fused-src", "../.."])
@@ -10,4 +11,10 @@ gtest = cppenv.Object("vendor/gtest-1.7.0/fused-src/gtest/gtest-all.cc")
 
 
 hammer_test = cppenv.Program("hammer_test", libhammer_shared + gtest + ['cpp_tests.cpp'])
+cpptest = Alias('testcpp', [hammer_test], "".join(["env LD_LIBRARY_PATH=", os.path.dirname(str(libhammer_shared[0])), " ", hammer_test[0].path]))
+AlwaysBuild(cpptest)
+testruns.append(cpptest)
 
+cppinstallexec = cppenv.Install("$incpath", ['hammer/hammer.hpp', 'hammer/hammer_test.hpp'])
+cppinstall = Alias("installcpp", [cppinstallexec], cppinstallexec)
+targets.append(cppinstall)
diff --git a/src/bindings/cpp/hammer/hammer.cpp b/src/bindings/cpp/hammer/hammer.cpp
deleted file mode 100644
index 8b13789..0000000
--- a/src/bindings/cpp/hammer/hammer.cpp
+++ /dev/null
@@ -1 +0,0 @@
-