diff --git a/SConstruct b/SConstruct
index 89a31edd08..b13789afb9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2300,10 +2300,13 @@ if env["python_sdist"]:
 VariantDir('build/samples', 'samples', duplicate=0)
 sampledir_excludes = ['\\.o$', '^~$', '\\.in', 'SConscript']
 SConscript('build/samples/cxx/SConscript')
+SConscript('build/samples/clib/SConscript')
 
-# Install C++ samples
+# Install C++ / C samples
 install(env.RecursiveInstall, '$inst_sampledir/cxx',
         'samples/cxx', exclude=sampledir_excludes)
+install(env.RecursiveInstall, '$inst_sampledir/clib',
+        'samples/clib', exclude=sampledir_excludes)
 
 if env['f90_interface'] == 'y':
     SConscript('build/samples/f77/SConscript')
diff --git a/test_problems/SConscript b/test_problems/SConscript
index 08a681306f..d3c270d337 100644
--- a/test_problems/SConscript
+++ b/test_problems/SConscript
@@ -208,9 +208,6 @@ Test('VCS-LiSi-verbose', 'VCSnonideal/LatticeSolid_LiSi', vcs_LiSi.program,
      'verbose_blessed.txt', options='8',
      artifacts=['vcs_equilibrate_res.csv'])
 
-CompileAndTest('clib-demo', 'clib_test', 'clib_test',
-               extensions=['^clib_test.c'], libs=localenv['cantera_shared_libs'])
-
 # C++ Samples
 Test('cxx-bvp', 'cxx_samples', '#build/samples/cxx/bvp/blasius', None,
      profiles=[('blasius_blessed.csv', 'blasius.csv')],
@@ -245,6 +242,8 @@ if env['HAS_OPENMP']:
 Test('cxx-rankine', 'cxx_samples', '#build/samples/cxx/rankine/rankine',
      'rankine_blessed.txt')
 
+Test('clib-demo', 'clib', '#build/samples/clib/demo', 'clib_demo_blessed.txt')
+
 if env['f90_interface'] == 'y':
     Test('f90-demo', 'fortran', '#build/samples/f90/demo', 'f90_demo_blessed.txt',
          threshold=1e-10)