diff --git a/.travis.yml b/.travis.yml
index 865e21f046b7f3ac4bc3de09c1300a0a1d0337d4..d73fd39aa7a2ee87c0e31436ffc14df2213134c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ addons:
       - python2.7-dev
       - python-numpy
       - python-wheel
+      - libboost-dev
       - curl
       - swig
       - graphviz
diff --git a/paddle/majel/CMakeLists.txt b/paddle/majel/CMakeLists.txt
index 0c91fa72da4e5f7b19d0f3141799729e8a6375d3..baa3bb9e914b3053a18dc638146325ffe3d28a12 100644
--- a/paddle/majel/CMakeLists.txt
+++ b/paddle/majel/CMakeLists.txt
@@ -21,7 +21,7 @@ else()
 endif()
 
 ########################### Build Majel #############################
-set(MAJEL_CXX_FILES place.cpp)
+set(MAJEL_CXX_FILES place.cc)
 set(MAJEL_CUDA_FILES "")
 
 if(CUDA_FOUND)
diff --git a/paddle/majel/place.cpp b/paddle/majel/place.cc
similarity index 100%
rename from paddle/majel/place.cpp
rename to paddle/majel/place.cc
diff --git a/paddle/majel/test/CMakeLists.txt b/paddle/majel/test/CMakeLists.txt
index 0cc7103b0391184951c3d5c0511ef790e1bcbd2d..46da6ff89b4a1d68fe4229b4f0f051000ab390c7 100644
--- a/paddle/majel/test/CMakeLists.txt
+++ b/paddle/majel/test/CMakeLists.txt
@@ -1,10 +1,11 @@
-file(GLOB_RECURSE ALL_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cpp" "*.cc")
+file(GLOB_RECURSE ALL_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cc")
 
 add_executable(majel_tests ${ALL_TEST_FILES})
 add_dependencies(majel_tests majel)
 target_link_libraries(majel_tests     
                       ${Boost_LIBRARIES}
                       ${GTEST_LIBRARIES}
+                      ${GTEST_MAIN_LIBRARIES}
                       majel
                      )
 add_test(majel_tests majel_tests)
diff --git a/paddle/majel/test/place_test.cpp b/paddle/majel/test/place_test.cc
similarity index 100%
rename from paddle/majel/test/place_test.cpp
rename to paddle/majel/test/place_test.cc
diff --git a/paddle/majel/test/test_framework.cpp b/paddle/majel/test/test_framework.cpp
deleted file mode 100644
index 443e2dbb3f2b7064f52ccfa017111b7e781f0e97..0000000000000000000000000000000000000000
--- a/paddle/majel/test/test_framework.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "gtest/gtest.h"
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}