diff --git a/phreeqc3-examples/CMakeLists.txt b/phreeqc3-examples/CMakeLists.txt
index ddd47824..46fcfe2e 100644
--- a/phreeqc3-examples/CMakeLists.txt
+++ b/phreeqc3-examples/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required (VERSION 3.9)
+
 SET(phreeqc_EXAMPLES
 co2.tsv
 ex1
@@ -52,7 +54,7 @@ else()
 endif()
 
 #
-# copy tsv files to output directories
+# copy tsv files to build directories for testing
 #
 
 # ex2b.tsv
@@ -108,167 +110,177 @@ configure_file (
   "co2.tsv"
   "co2.tsv"
   )
-  
+
 #
 # run examples for testing
 #
 
 # ex1
-add_test(NAME ex1
+add_test(NAME examples.ex1
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex1 ex1.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex1.log
 )
 
 # ex2
-add_test(NAME ex2
+add_test(NAME examples.ex2
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex2 ex2.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex2.log
 )
 
 # ex2b
-add_test(NAME ex2b
+add_test(NAME examples.ex2b
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex2b ex2b.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex2b.log
 )
 
 # ex3
-add_test(NAME ex3
+add_test(NAME examples.ex3
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex3 ex3.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex3.log
 )
 
 # ex4
-add_test(NAME ex4
+add_test(NAME examples.ex4
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex4 ex4.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex4.log
 )
 
 # ex5
-add_test(NAME ex5
+add_test(NAME examples.ex5
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex5 ex5.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex5.log
 )
 
 # ex6
-add_test(NAME ex6
+add_test(NAME examples.ex6
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex6 ex6.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex6.log
 )
 
 # ex7
-add_test(NAME ex7
+add_test(NAME examples.ex7
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex7 ex7.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex7.log
 )
 
 # ex8
-add_test(NAME ex8
+add_test(NAME examples.ex8
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex8 ex8.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex8.log
 )
 
 # ex9
-add_test(NAME ex9
+add_test(NAME examples.ex9
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex9 ex9.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex9.log
 )
 
 # ex10
-add_test(NAME ex10
+add_test(NAME examples.ex10
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex10 ex10.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex10.log
 )
 
 # ex11
-add_test(NAME ex11
+add_test(NAME examples.ex11
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex11 ex11.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex11.log
 )
 
 # ex12
-add_test(NAME ex12
+add_test(NAME examples.ex12
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex12 ex12.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex12.log
 )
 
 # ex12a
-add_test(NAME ex12a
+add_test(NAME examples.ex12a
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex12a ex12a.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex12a.log
 )
 
 # ex13a
-add_test(NAME ex13a
+add_test(NAME examples.ex13a
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex13a ex13a.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex13a.log
 )
 
 # ex13b
-add_test(NAME ex13b
+add_test(NAME examples.ex13b
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex13b ex13b.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex13b.log
 )
 
 # ex13c
-add_test(NAME ex13c
+add_test(NAME examples.ex13c
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex13c ex13c.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex13c.log
 )
 
 # ex13ac
-add_test(NAME ex13ac
+add_test(NAME examples.ex13ac
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex13ac ex13ac.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex13ac.log
 )
 
 # ex14
-add_test(NAME ex14
+add_test(NAME examples.ex14
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex14 ex14.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex14.log
 )
 
 # ex15
-add_test(NAME ex15
+add_test(NAME examples.ex15
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex15 ex15.out ${PROJECT_SOURCE_DIR}/examples/ex15.dat ex15.log
 )
 
 # ex15a
-add_test(NAME ex15a
+add_test(NAME examples.ex15a
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex15a ex15a.out ${PROJECT_SOURCE_DIR}/examples/ex15.dat ex15a.log
 )
 
 # ex15b
-add_test(NAME ex15b
+add_test(NAME examples.ex15b
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex15b ex15b.out ${PROJECT_SOURCE_DIR}/examples/ex15.dat ex15b.log
 )
 
 # ex16
-add_test(NAME ex16
+add_test(NAME examples.ex16
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex16 ex16.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex16.log
 )
 	
 # ex17
-add_test(NAME ex17
+add_test(NAME examples.ex17
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex17 ex17.out ${PROJECT_SOURCE_DIR}/database/pitzer.dat ex17.log
 )
 
 # ex17b
-add_test(NAME ex17b
+add_test(NAME examples.ex17b
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex17b ex17b.out ${PROJECT_SOURCE_DIR}/database/pitzer.dat ex17b.log
 )
 
 # ex18
-add_test(NAME ex18
+add_test(NAME examples.ex18
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex18 ex18.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex18.log
 )
 
 # ex19
-add_test(NAME ex19
+add_test(NAME examples.ex19
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex19 ex19.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex19.log
 )
 
 # ex19b
-add_test(NAME ex19b
+add_test(NAME examples.ex19b
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex19b ex19b.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex19b.log
 )
 
 # ex20a
-add_test(NAME ex20a
+add_test(NAME examples.ex20a
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex20a ex20a.out ${PROJECT_SOURCE_DIR}/database/iso.dat ex20a.log
 )
 
 # ex20b
-add_test(NAME ex20b
+add_test(NAME examples.ex20b
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex20b ex20b.out ${PROJECT_SOURCE_DIR}/database/iso.dat ex20b.log
 )
 
 # ex21
-add_test(NAME ex21
+add_test(NAME examples.ex21
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex21 ex21.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex21.log
 )
 
 # ex22
-add_test(NAME ex22
+add_test(NAME examples.ex22
 COMMAND $<TARGET_FILE:phreeqc> ${PROJECT_SOURCE_DIR}/examples/ex22 ex22.out ${PROJECT_SOURCE_DIR}/database/phreeqc.dat ex22.log
 )
+
+# these take more than 600 seconds
+set(SKIP
+  examples.ex21
+)
+
+# disable tests that take too long
+foreach(test ${SKIP})
+  set_tests_properties(${test} PROPERTIES DISABLED TRUE)
+endforeach()