diff --git a/testcpp/Makefile b/testcpp/Makefile
index fdce59866..ccd44172b 100644
--- a/testcpp/Makefile
+++ b/testcpp/Makefile
@@ -1,5 +1,3 @@
-#
-#
 #  BLIS    
 #  An object-based framework for developing high-performance BLAS-like
 #  libraries.
@@ -117,7 +115,7 @@ CINCFLAGS      := -I$(INC_PATH)
 CXX	= g++
 
 # Use the CFLAGS for the configuration family.
-override CFLAGS         += $(call get-user-cflags-for,$(CONFIG_NAME))
+override CFLAGS         += $(call get-sandbox-cxxflags-for,$(CONFIG_NAME))
 
 # Add local header paths to CFLAGS
 #CFLAGS         = -O0 -g -Wall 
@@ -140,10 +138,51 @@ LIBBLIS_LINK   := $(LIB_PATH)/$(LIBBLIS_L)
 #
 #   blis 
 #
-#all: blis
 all: blis 
 
-blis: test_gemm_blis.x 
+
+blis: test_asum_blis.x \
+	test_axpy_blis.x \
+	test_copy_blis.x \
+	test_dot_blis.x \
+	test_dotc_blis.x \
+	test_gbmv_blis.x \
+	test_gemm_blis.x \
+	test_gemv_blis.x \
+	test_ger_blis.x \
+	test_gerc_blis.x \
+	test_geru_blis.x \
+	test_hemm_blis.x \
+	test_hemv_blis.x \
+	test_her2_blis.x \
+	test_her_blis.x \
+	test_herk_blis.x \
+	test_hpr2_blis.x \
+	test_hpr_blis.x \
+	test_nrm2_blis.x \
+	test_rot_blis.x \
+	test_rotg_blis.x \
+	test_rotm_blis.x \
+	test_rotmg_blis.x \
+	test_scal_blis.x \
+	test_sdsdot_blis.x \
+	test_spr2_blis.x \
+	test_spr_blis.x \
+	test_swap_blis.x \
+	test_symm_blis.x \
+	test_syr2_blis.x \
+	test_syr2k_blis.x \
+	test_syr_blis.x \
+	test_syrk_blis.x \
+	test_tbmv_blis.x \
+	test_tbsv_blis.x \
+	test_tpmv_blis.x \
+	test_tpsv_blis.x \
+	test_trmm_blis.x \
+	test_trsm_blis.x \
+	test_trsv_blis.x 
+ 
+
 
 # --Object file rules --
 
@@ -151,18 +190,14 @@ $(TEST_OBJ_PATH)/%.o: $(TEST_SRC_PATH)/%.cc
 	$(CXX) $(CFLAGS) -c $< -o $@
 
 test_%_blis.o: test_%.cc
-	$(CXX) $(CFLAGS) -c $< -o $@
+	@$(CXX) $(CFLAGS) -c $< -o $@
 
 
 # -- Executable file rules --
 
-# NOTE: For the BLAS test drivers, we place the BLAS libraries before BLIS
-# on the link command line in case BLIS was configured with the BLAS
-# compatibility layer. This prevents BLIS from inadvertently getting called
-# for the BLAS routines we are trying to test with.
-
 test_%_blis.x: test_%_blis.o $(LIBBLIS_LINK)
-	$(LINKER) $^       $(LIBBLIS_LINK) $(LDFLAGS) -o $@
+	@$(LINKER) $^       $(LIBBLIS_LINK) $(LDFLAGS) -o $@
+	./$@
 
 # -- Clean rules --