diff --git a/configure.ac b/configure.ac
index 663ceb582..758b12da9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,7 @@ AC_OUTPUT(Makefile                                                         \
                    test_problems/pureFluidTest/Makefile                    \
                    test_problems/silane_equil/Makefile                     \
                    test_problems/spectroscopy/Makefile                     \
+                   test_problems/surfkin/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 557d589ae..7cc24c5ef 100644
--- a/test_problems/Makefile.am
+++ b/test_problems/Makefile.am
@@ -1,12 +1,12 @@
 
-#SUBDIRS    = surfkin VPsilance_test \
+#SUBDIRS    = VPsilance_test \
 	     diamondSurf_dupl surfSolverTest
 
 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
+SUBDIRS += spectroscopy surfkin
 
 
 # skipped:
diff --git a/test_problems/surfkin/Makefile.am b/test_problems/surfkin/Makefile.am
new file mode 100644
index 000000000..18d793ea6
--- /dev/null
+++ b/test_problems/surfkin/Makefile.am
@@ -0,0 +1,23 @@
+cc_sources = surfdemo.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         = surfdemo
+library_includedir   = $(INC)
+
+#-----------------------
+# Cantera DH graph test
+#-----------------------
+
+surfdemo_SOURCES = $(cc_sources)
+
+TESTS_ENVIRONMENT = 
+TESTS             = runtest
diff --git a/test_problems/surfkin/runtest b/test_problems/surfkin/runtest
index 5ad51209f..460789937 100755
--- a/test_problems/surfkin/runtest
+++ b/test_problems/surfkin/runtest
@@ -19,15 +19,16 @@ then
   echo "surfdemo returned with bad status, $retnStat, check output"
 fi
 
-
 diff -w output.txt output_blessed.txt > diff_test.out
 retnStat=$?
 if [ $retnStat = "0" ]
 then
   echo "successful diff comparison on surfkin test"
+  return 0
 else
   echo "unsuccessful diff comparison on surfkin test"
   echo "FAILED" > csvCode.txt
   temp_success="0"
+  return 1
 fi