diff --git a/configure.ac b/configure.ac
index 758b12da9..171b5d305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,7 @@ AC_OUTPUT(Makefile                                                         \
                    test_problems/silane_equil/Makefile                     \
                    test_problems/spectroscopy/Makefile                     \
                    test_problems/surfkin/Makefile                          \
+                   test_problems/surfSolverTest/Makefile                   \
                    test_problems/cathermo/Makefile                         \
                    test_problems/cathermo/DH_graph_1/Makefile              \
                    test_problems/cathermo/DH_graph_acommon/Makefile        \
diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am
index 7cc24c5ef..cce21848e 100644
--- a/test_problems/Makefile.am
+++ b/test_problems/Makefile.am
@@ -1,15 +1,13 @@
 
-#SUBDIRS    = VPsilance_test \
-	     diamondSurf_dupl surfSolverTest
+#SUBDIRS    = VPsilance_test VCSnonideal
 
 SUBDIRS  = cathermo mixGasTransport ChemEquil_gri_matrix ChemEquil_gri_pairs
 SUBDIRS += ChemEquil_ionizedGas ChemEquil_red1 CpJump cxx_ex diamondSurf 
 SUBDIRS += diamondSurf_dupl fracCoeff multiGasTransport NASA9poly_test
 SUBDIRS += negATest printUtilUnitTest pureFluidTest silane_equil 
-SUBDIRS += spectroscopy surfkin
+SUBDIRS += spectroscopy surfkin surfSolverTest
 
-
-# skipped:
+# skipped (uses ck2cti or python):
 # ck2cti_test
 # nasa9_reader (uses ck2cti)
 # python
diff --git a/test_problems/surfSolverTest/Makefile.am b/test_problems/surfSolverTest/Makefile.am
new file mode 100644
index 000000000..c7cf5b769
--- /dev/null
+++ b/test_problems/surfSolverTest/Makefile.am
@@ -0,0 +1,25 @@
+cc_sources = surfaceSolver.cpp
+cc2_sources = surfaceSolver2.cpp
+
+INC                  = -I. -I$(top_builddir)/build/include/
+AM_CPPFLAGS          = $(INC)
+AM_CXXFLAGS          = $(AM_CPPFLAGS)
+
+LINK                 = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo 
+LINK                += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode 
+LINK                += -lctlapack -lctblas -lctf2c -lctcxx -lm  -lctf2c -lstdc++
+AM_LDFLAGS           = -L$(top_builddir)/build/lib/ 
+LIBS                 =  $(LINK)
+
+bin_PROGRAMS         = surfaceSolver surfaceSolver2
+library_includedir   = $(INC)
+
+#-----------------------
+# Cantera DH graph test
+#-----------------------
+
+surfaceSolver_SOURCES  = $(cc_sources)
+surfaceSolver2_SOURCES = $(cc2_sources)
+
+TESTS_ENVIRONMENT = 
+TESTS             = runtest runtest2
diff --git a/test_problems/surfSolverTest/runtest b/test_problems/surfSolverTest/runtest
index 1f1ed8cfd..b54b19154 100755
--- a/test_problems/surfSolverTest/runtest
+++ b/test_problems/surfSolverTest/runtest
@@ -31,19 +31,22 @@ then
   if [ $retnStat_txt != "0" ]
   then
      echo "   But, text output files have differences. See diff_out.txt"
+     return 1
   fi
 else
   echo "Unsuccessful test comparison on "`pwd` " test"
   if test $retnStat_csv != "0"
   then
      echo "      results files are different - see diff_csv.txt"
+     return 1
   fi
   if test $retnStat_txt != "0"
   then
      echo "      And, text output files have differences. See diff_out.txt"
+     return 1
   fi
 fi
 
-
+return 0
 
 
diff --git a/test_problems/surfSolverTest/runtest2 b/test_problems/surfSolverTest/runtest2
index 76ca39fca..304d2cd0c 100755
--- a/test_problems/surfSolverTest/runtest2
+++ b/test_problems/surfSolverTest/runtest2
@@ -31,17 +31,21 @@ then
   if [ $retnStat_txt != "0" ]
   then
      echo "   But, text output files have differences. See diff_2out.txt"
+     return 1
   fi
 else
   echo "Unsuccessful test comparison on "`pwd` " test"
   if test $retnStat_csv != "0"
   then
      echo "      results files are different - see diff_2csv.txt"
+     return 1
   fi
   if test $retnStat_txt != "0"
   then
      echo "      And, text output files have differences. See diff_2out.txt"
+     return 1
   fi
 fi
 
+return 0
 
diff --git a/test_problems/surfSolverTest/surfaceSolver.cpp b/test_problems/surfSolverTest/surfaceSolver.cpp
index 3474a45e5..4f0ea189d 100644
--- a/test_problems/surfSolverTest/surfaceSolver.cpp
+++ b/test_problems/surfSolverTest/surfaceSolver.cpp
@@ -38,8 +38,8 @@ static void printUsage()
 #include "Interface.h"
 
 #include "kinetics.h"
-#include "kernel/ImplicitSurfChem.h"
-#include "kernel/solveSP.h"
+#include "ImplicitSurfChem.h"
+#include "solveSP.h"
 
 using namespace Cantera;
 
diff --git a/test_problems/surfSolverTest/surfaceSolver2.cpp b/test_problems/surfSolverTest/surfaceSolver2.cpp
index 7794fd926..56149008a 100644
--- a/test_problems/surfSolverTest/surfaceSolver2.cpp
+++ b/test_problems/surfSolverTest/surfaceSolver2.cpp
@@ -37,8 +37,8 @@ static void printUsage()
 #include "Interface.h"
 
 #include "kinetics.h"
-#include "kernel/ImplicitSurfChem.h"
-#include "kernel/solveSP.h"
+#include "ImplicitSurfChem.h"
+#include "solveSP.h"
 
 using namespace Cantera;