diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index dec4ca7..f26ec2e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,11 +33,17 @@ boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost
 boost_test(TYPE run SOURCES test_io.cpp LINK_LIBRARIES Boost::lexical_cast Boost::predef COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_io_no_simd)
 boost_test(TYPE run SOURCES test_io_2.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1)
 boost_test(TYPE run SOURCES test_io_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_io_2_no_simd)
+
 boost_test(TYPE run SOURCES test_to_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1)
 boost_test(TYPE run SOURCES test_to_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_to_chars_no_simd)
 boost_test(TYPE run SOURCES test_to_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1)
 boost_test(TYPE run SOURCES test_to_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_to_chars_2_no_simd)
 
+boost_test(TYPE run SOURCES test_from_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1)
+boost_test(TYPE run SOURCES test_from_chars.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_from_chars_no_simd)
+boost_test(TYPE run SOURCES test_from_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_REPORT_IMPLEMENTATION=1)
+boost_test(TYPE run SOURCES test_from_chars_2.cpp COMPILE_DEFINITIONS BOOST_UUID_NO_SIMD=1 BOOST_UUID_REPORT_IMPLEMENTATION=1 NAME test_from_chars_2_no_simd)
+
 boost_test(TYPE run SOURCES test_uuid_clock.cpp)
 
 boost_test(TYPE run SOURCES test_nil_generator.cpp)
@@ -91,4 +97,9 @@ boost_test(TYPE compile SOURCES test_uuid_cx.cpp)
 boost_test(TYPE run SOURCES test_string_generator_cx.cpp)
 boost_test(TYPE run SOURCES test_constants_cx.cpp)
 
+boost_test(TYPE run SOURCES test_to_chars_cx.cpp LINK_LIBRARIES Boost::array)
+
+boost_test(TYPE run SOURCES test_from_chars_cx.cpp)
+boost_test(TYPE run SOURCES test_from_chars_cx2.cpp)
+
 boost_test(TYPE run SOURCES quick.cpp)
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 03b9c74..ac07781 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -100,8 +100,10 @@ run test_to_chars.cpp : : : <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPORT
 run test_to_chars_2.cpp : : : <define>BOOST_UUID_REPORT_IMPLEMENTATION ;
 run test_to_chars_2.cpp : : : <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPORT_IMPLEMENTATION : test_to_chars_2_no_simd ;
 
-run test_from_chars.cpp ;
-run test_from_chars_2.cpp ;
+run test_from_chars.cpp : : : <define>BOOST_UUID_REPORT_IMPLEMENTATION ;
+run test_from_chars.cpp : : : <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPORT_IMPLEMENTATION : test_from_chars_no_simd ;
+run test_from_chars_2.cpp : : : <define>BOOST_UUID_REPORT_IMPLEMENTATION ;
+run test_from_chars_2.cpp : : : <define>BOOST_UUID_NO_SIMD <define>BOOST_UUID_REPORT_IMPLEMENTATION : test_from_chars_2_no_simd ;
 
 # test uuid_clock