diff --git a/test_problems/SConscript b/test_problems/SConscript
index e064935f6..5af2f4c2e 100644
--- a/test_problems/SConscript
+++ b/test_problems/SConscript
@@ -281,10 +281,16 @@ CompileAndTest('rankine_democxx', 'rankine_democxx', 'rankine', 'output_blessed.
 CompileAndTest('silane_equil', 'silane_equil', 'silane_equi', 'output_blessed.txt')
 # spectroscopy is incomplete
 CompileAndTest('surfkin', 'surfkin', 'surfdemo', 'output_blessed.txt')
-CompileAndTest('surfSolver', 'surfSolverTest', 'surfaceSolver', 'surfaceSolver_blessed.out',
+CompileAndTest('surfSolver', 'surfSolverTest', 'surfaceSolver', None,
                arguments='haca2.xml',
+               comparisons=[('results_blessed.txt', 'results.txt')],
                artifacts=['results.txt', 'diamond.xml'],
-               extensions=['^surfaceSolver.cpp']) # needs .csv, extra tests
+               extensions=['^surfaceSolver.cpp'])
+CompileAndTest('surfSolver2', 'surfSolverTest', 'surfaceSolver2', None,
+               arguments='haca2.xml',
+               comparisons=[('results2_blessed.txt', 'results2.txt')],
+               artifacts=['results2.txt', 'diamond.xml'],
+               extensions=['^surfaceSolver2.cpp'])
 CompileAndTest('VCSnonideal', pjoin('VCSnonideal', 'NaCl_equil'),
                'nacl_equil', 'good_out.txt',
                options='-d 3',