diff --git a/jamroot.jam b/jamroot.jam
index 21cb7a45d..92c861647 100644
--- a/jamroot.jam
+++ b/jamroot.jam
@@ -1,5 +1,15 @@
+import os ;
+
+local GTEST_DIR = [ os.environ GTEST_DIR ] ;
+project gtest : source-location $(GTEST_DIR)/src : build-dir ../../build ; 
+
+lib gtest
+   : gtest-all.cc               # sources
+   : <include>$(GTEST_DIR)      # requirements
+     <include>$(GTEST_DIR)/include 
+     <link>static ;
+
 
-lib gtest ;
 lib glog ;
 lib gflags ;
 lib gnuradio-core ;
@@ -42,6 +52,7 @@ project : requirements
 <include>$GNURADIO_ROOT/gnuradio-core/src/lib/general
 <include>$GNURADIO_ROOT/gnuradio-core/src/lib/gengen
 <include>$GNURADIO_ROOT/volk/lib
+<include>$(GTEST_DIR)/include
 <threading>multi 
 <toolset>darwin:<include>/opt/local/include ;
 
diff --git a/src/tests/gnuradio_block/gnss_sdr_valve_test.cc b/src/tests/gnuradio_block/gnss_sdr_valve_test.cc
index 6c4af953a..02da52d50 100644
--- a/src/tests/gnuradio_block/gnss_sdr_valve_test.cc
+++ b/src/tests/gnuradio_block/gnss_sdr_valve_test.cc
@@ -33,7 +33,7 @@
 
 #include <gtest/gtest.h>
 #include <gr_top_block.h>
-#include <gr_sig_source_f.h>
+#include <gnuradio/gr_sig_source_f.h>
 #include <gr_null_sink.h>
 #include <gr_msg_queue.h>
 #include "gnss_sdr_valve.h"
diff --git a/src/tests/jamfile.jam b/src/tests/jamfile.jam
index d29afb94c..3d7bd8d0a 100644
--- a/src/tests/jamfile.jam
+++ b/src/tests/jamfile.jam
@@ -1,8 +1,5 @@
-lib gtest ;
-
-obj test_main : test_main.cc  ;
-
 project : build-dir ../../build ;
+
 exe run_tests : test_main.cc 
 ../algorithms/acquisition/adapters//gps_l1_ca_gps_sdr_acquisition
 ../algorithms/acquisition/adapters//gps_l1_ca_pcps_acquisition
@@ -59,7 +56,7 @@ exe run_tests : test_main.cc
 ../core/system_parameters//gnss_satellite
 ../..//gflags
 ../..//glog
-../..//gnuradio-core
-../..//gtest ;
+../..//gnuradio-core 
+../..//gtest : <include>$(GTEST_DIR)/include ;
 
-install ../../install : run_tests ;
\ No newline at end of file
+install ../../install : run_tests ;