diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 386710a..889f39f 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -6,18 +6,30 @@ endif ()
 include_directories(../include)
 
 set(SAMPLES
-  signal
-  exit
-  report
-  suites
-  fixtures
-  asserts
-  more-suites
-  long-messages
-  description
-  other-crashes
-  simple
-  theories
+  signal.c
+  exit.c
+  report.c
+  suites.c
+  fixtures.c
+  asserts.c
+  more-suites.c
+  long-messages.c
+  description.c
+  other-crashes.c
+  simple.c
+  theories.c
+
+  signal.cc
+  exit.cc
+  report.cc
+  suites.cc
+  fixtures.cc
+  asserts.cc
+  more-suites.cc
+  long-messages.cc
+  description.cc
+  other-crashes.cc
+  simple.cc
 )
 
 set(SCRIPTS
@@ -34,22 +46,15 @@ if (HAVE_PCRE)
 endif ()
 
 foreach(sample ${SAMPLES})
-    add_executable(${sample} ${sample}.c)
-    target_link_libraries(${sample} criterion)
-    add_test(${sample} ${sample})
-    set_property(TEST ${sample} PROPERTY
-        ENVIRONMENT "CRITERION_ALWAYS_SUCCEED=1"
-    )
-
-    add_executable(${sample}_cpp ${sample}.cc)
-    target_link_libraries(${sample}_cpp criterion)
-    add_test(${sample}_cpp ${sample}_cpp)
+    add_executable(${sample}.bin ${sample})
+    target_link_libraries(${sample}.bin criterion)
+    add_test(${sample} ${sample}.bin)
     set_property(TEST ${sample} PROPERTY
         ENVIRONMENT "CRITERION_ALWAYS_SUCCEED=1"
     )
 
     if (NOT MSVC) # we disable the scripted tests when building with MSVC
-        add_test(${sample}_compare sh ${CMAKE_CURRENT_LIST_DIR}/tests/run_test.sh "${CMAKE_CURRENT_LIST_DIR}" . . ${sample})
+        add_test(${sample}_compare sh ${CMAKE_CURRENT_LIST_DIR}/tests/run_test.sh "${CMAKE_CURRENT_LIST_DIR}" . . ${sample}.bin)
         set_property(TEST ${sample}_compare PROPERTY
             ENVIRONMENT "LC_ALL=en_US.utf8"
             ENVIRONMENT "CRITERION_ALWAYS_SUCCEED=1"
diff --git a/samples/asserts.err.expected b/samples/asserts.c.bin.err.expected
similarity index 57%
rename from samples/asserts.err.expected
rename to samples/asserts.c.bin.err.expected
index 644a440..0f81d72 100644
--- a/samples/asserts.err.expected
+++ b/samples/asserts.c.bin.err.expected
@@ -1,6 +1,6 @@
-[----] asserts.c:11: Assertion failed: assert is fatal, expect isn't
-[----] asserts.c:12: Assertion failed: This assert runs
+[----] asserts.c:9: Assertion failed: assert is fatal, expect isn't
+[----] asserts.c:10: Assertion failed: This assert runs
 [FAIL] asserts::base: (0.00s)
-[----] asserts.c:20: Assertion failed: The conditions for this test were not met.
+[----] asserts.c:18: Assertion failed: The conditions for this test were not met.
 [FAIL] asserts::old_school: (0.00s)
 [====] Synthesis: Tested: 6 | Passing: 4 | Failing: 2 | Crashing: 0 
diff --git a/samples/asserts.out.expected b/samples/asserts.c.bin.out.expected
similarity index 100%
rename from samples/asserts.out.expected
rename to samples/asserts.c.bin.out.expected
diff --git a/samples/asserts.cc.bin.err.expected b/samples/asserts.cc.bin.err.expected
new file mode 100644
index 0000000..3b7d7ae
--- /dev/null
+++ b/samples/asserts.cc.bin.err.expected
@@ -0,0 +1,6 @@
+[----] asserts.cc:9: Assertion failed: assert is fatal, expect isn't
+[----] asserts.cc:10: Assertion failed: This assert runs
+[FAIL] asserts::base: (0.00s)
+[----] asserts.cc:18: Assertion failed: The conditions for this test were not met.
+[FAIL] asserts::old_school: (0.00s)
+[====] Synthesis: Tested: 6 | Passing: 4 | Failing: 2 | Crashing: 0 
diff --git a/samples/description.out.expected b/samples/asserts.cc.bin.out.expected
similarity index 100%
rename from samples/description.out.expected
rename to samples/asserts.cc.bin.out.expected
diff --git a/samples/description.err.expected b/samples/description.c.bin.err.expected
similarity index 100%
rename from samples/description.err.expected
rename to samples/description.c.bin.err.expected
diff --git a/samples/exit.out.expected b/samples/description.c.bin.out.expected
similarity index 100%
rename from samples/exit.out.expected
rename to samples/description.c.bin.out.expected
diff --git a/samples/description.cc.bin.err.expected b/samples/description.cc.bin.err.expected
new file mode 100644
index 0000000..730b527
--- /dev/null
+++ b/samples/description.cc.bin.err.expected
@@ -0,0 +1,3 @@
+[----] description.cc:4: Assertion failed: 0
+[FAIL] misc::failing: (0.00s)
+[====] Synthesis: Tested: 1 | Passing: 0 | Failing: 1 | Crashing: 0 
diff --git a/samples/long-messages.out.expected b/samples/description.cc.bin.out.expected
similarity index 100%
rename from samples/long-messages.out.expected
rename to samples/description.cc.bin.out.expected
diff --git a/samples/exit.err.expected b/samples/exit.c.bin.err.expected
similarity index 100%
rename from samples/exit.err.expected
rename to samples/exit.c.bin.err.expected
diff --git a/samples/more-suites.out.expected b/samples/exit.c.bin.out.expected
similarity index 100%
rename from samples/more-suites.out.expected
rename to samples/exit.c.bin.out.expected
diff --git a/samples/exit.cc.bin.err.expected b/samples/exit.cc.bin.err.expected
new file mode 100644
index 0000000..3ffe51b
--- /dev/null
+++ b/samples/exit.cc.bin.err.expected
@@ -0,0 +1,4 @@
+[----] Warning! The test `exit::unexpected_exit` exited during its setup or teardown.
+[----] Warning! The test `exit_with_fixtures::fini_exits` exited during its setup or teardown.
+[----] Warning! The test `exit_with_fixtures::init_exits` exited during its setup or teardown.
+[====] Synthesis: Tested: 5 | Passing: 3 | Failing: 2 | Crashing: 2 
diff --git a/samples/other-crashes.out.expected b/samples/exit.cc.bin.out.expected
similarity index 100%
rename from samples/other-crashes.out.expected
rename to samples/exit.cc.bin.out.expected
diff --git a/samples/fixtures.err.expected b/samples/fixtures.c.bin.err.expected
similarity index 100%
rename from samples/fixtures.err.expected
rename to samples/fixtures.c.bin.err.expected
diff --git a/samples/fixtures.out.expected b/samples/fixtures.c.bin.out.expected
similarity index 100%
rename from samples/fixtures.out.expected
rename to samples/fixtures.c.bin.out.expected
diff --git a/samples/fixtures.cc.bin.err.expected b/samples/fixtures.cc.bin.err.expected
new file mode 100644
index 0000000..a34f221
--- /dev/null
+++ b/samples/fixtures.cc.bin.err.expected
@@ -0,0 +1 @@
+[====] Synthesis: Tested: 1 | Passing: 1 | Failing: 0 | Crashing: 0 
diff --git a/samples/fixtures.cc.bin.out.expected b/samples/fixtures.cc.bin.out.expected
new file mode 100644
index 0000000..a74afed
--- /dev/null
+++ b/samples/fixtures.cc.bin.out.expected
@@ -0,0 +1,2 @@
+Runs before the test
+Runs after the test
diff --git a/samples/long-messages.err.expected b/samples/long-messages.c.bin.err.expected
similarity index 100%
rename from samples/long-messages.err.expected
rename to samples/long-messages.c.bin.err.expected
diff --git a/samples/signal.out.expected b/samples/long-messages.c.bin.out.expected
similarity index 100%
rename from samples/signal.out.expected
rename to samples/long-messages.c.bin.out.expected
diff --git a/samples/long-messages.cc.bin.err.expected b/samples/long-messages.cc.bin.err.expected
new file mode 100644
index 0000000..fa56cf2
--- /dev/null
+++ b/samples/long-messages.cc.bin.err.expected
@@ -0,0 +1,6 @@
+[----] long-messages.cc:4: Assertion failed: This is
+[----]   A long message
+[----]   Spawning multiple lines.
+[----]   Formatting is respected.
+[FAIL] sample::long_msg: (0.00s)
+[====] Synthesis: Tested: 1 | Passing: 0 | Failing: 1 | Crashing: 0 
diff --git a/samples/simple.out.expected b/samples/long-messages.cc.bin.out.expected
similarity index 100%
rename from samples/simple.out.expected
rename to samples/long-messages.cc.bin.out.expected
diff --git a/samples/more-suites.err.expected b/samples/more-suites.c.bin.err.expected
similarity index 100%
rename from samples/more-suites.err.expected
rename to samples/more-suites.c.bin.err.expected
diff --git a/samples/suites.out.expected b/samples/more-suites.c.bin.out.expected
similarity index 100%
rename from samples/suites.out.expected
rename to samples/more-suites.c.bin.out.expected
diff --git a/samples/suites.err.expected b/samples/more-suites.cc.bin.err.expected
similarity index 100%
rename from samples/suites.err.expected
rename to samples/more-suites.cc.bin.err.expected
diff --git a/samples/more-suites.cc.bin.out.expected b/samples/more-suites.cc.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/other-crashes.err.expected b/samples/other-crashes.c.bin.err.expected
similarity index 100%
rename from samples/other-crashes.err.expected
rename to samples/other-crashes.c.bin.err.expected
diff --git a/samples/other-crashes.c.bin.out.expected b/samples/other-crashes.c.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/other-crashes.cc.bin.err.expected b/samples/other-crashes.cc.bin.err.expected
new file mode 100644
index 0000000..41d3cb8
--- /dev/null
+++ b/samples/other-crashes.cc.bin.err.expected
@@ -0,0 +1,3 @@
+[----] Warning! The test `misc::setup_crash` crashed during its setup or teardown.
+[----] Warning! The test `misc::teardown_crash` crashed during its setup or teardown.
+[====] Synthesis: Tested: 2 | Passing: 1 | Failing: 1 | Crashing: 1 
diff --git a/samples/other-crashes.cc.bin.out.expected b/samples/other-crashes.cc.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/report.err.expected b/samples/report.c.bin.err.expected
similarity index 100%
rename from samples/report.err.expected
rename to samples/report.c.bin.err.expected
diff --git a/samples/report.out.expected b/samples/report.c.bin.out.expected
similarity index 100%
rename from samples/report.out.expected
rename to samples/report.c.bin.out.expected
diff --git a/samples/report.cc.bin.err.expected b/samples/report.cc.bin.err.expected
new file mode 100644
index 0000000..d81ba26
--- /dev/null
+++ b/samples/report.cc.bin.err.expected
@@ -0,0 +1,3 @@
+[----] report.cc:5: Assertion failed: 0
+[FAIL] sample::test: (0.00s)
+[====] Synthesis: Tested: 1 | Passing: 0 | Failing: 1 | Crashing: 0 
diff --git a/samples/report.cc.bin.out.expected b/samples/report.cc.bin.out.expected
new file mode 100644
index 0000000..d560277
--- /dev/null
+++ b/samples/report.cc.bin.out.expected
@@ -0,0 +1,4 @@
+criterion_init
+testing test in category sample
+Asserts: [1 passed, 1 failed, 2 total]
+criterion_fini
diff --git a/samples/signal.err.expected b/samples/signal.c.bin.err.expected
similarity index 100%
rename from samples/signal.err.expected
rename to samples/signal.c.bin.err.expected
diff --git a/samples/signal.c.bin.out.expected b/samples/signal.c.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/signal.cc.bin.err.expected b/samples/signal.cc.bin.err.expected
new file mode 100644
index 0000000..8ac44c1
--- /dev/null
+++ b/samples/signal.cc.bin.err.expected
@@ -0,0 +1,4 @@
+[----] signal.cc:16: Unexpected signal caught below this line!
+[FAIL] simple::uncaught: CRASH!
+[FAIL] simple::wrong_signal: (0.00s)
+[====] Synthesis: Tested: 3 | Passing: 1 | Failing: 2 | Crashing: 1 
diff --git a/samples/signal.cc.bin.out.expected b/samples/signal.cc.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/simple.err.expected b/samples/simple.c.bin.err.expected
similarity index 100%
rename from samples/simple.err.expected
rename to samples/simple.c.bin.err.expected
diff --git a/samples/simple.c.bin.out.expected b/samples/simple.c.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/simple.cc.bin.err.expected b/samples/simple.cc.bin.err.expected
new file mode 100644
index 0000000..c52de64
--- /dev/null
+++ b/samples/simple.cc.bin.err.expected
@@ -0,0 +1,3 @@
+[----] simple.cc:4: Assertion failed: 0
+[FAIL] misc::failing: (0.00s)
+[====] Synthesis: Tested: 2 | Passing: 1 | Failing: 1 | Crashing: 0 
diff --git a/samples/simple.cc.bin.out.expected b/samples/simple.cc.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/suites.c.bin.err.expected b/samples/suites.c.bin.err.expected
new file mode 100644
index 0000000..09eb50f
--- /dev/null
+++ b/samples/suites.c.bin.err.expected
@@ -0,0 +1 @@
+[====] Synthesis: Tested: 2 | Passing: 2 | Failing: 0 | Crashing: 0 
diff --git a/samples/suites.c.bin.out.expected b/samples/suites.c.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/suites.cc.bin.err.expected b/samples/suites.cc.bin.err.expected
new file mode 100644
index 0000000..09eb50f
--- /dev/null
+++ b/samples/suites.cc.bin.err.expected
@@ -0,0 +1 @@
+[====] Synthesis: Tested: 2 | Passing: 2 | Failing: 0 | Crashing: 0 
diff --git a/samples/suites.cc.bin.out.expected b/samples/suites.cc.bin.out.expected
new file mode 100644
index 0000000..e69de29
diff --git a/samples/tests/early_exit.sh b/samples/tests/early_exit.sh
index f25738c..71bb31d 100755
--- a/samples/tests/early_exit.sh
+++ b/samples/tests/early_exit.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-./simple --no-early-exit --always-succeed
-./theories --no-early-exit --always-succeed
+./simple.c.bin --no-early-exit --always-succeed
+./theories.c.bin --no-early-exit --always-succeed
diff --git a/samples/tests/fail_fast.sh b/samples/tests/fail_fast.sh
index 3fecfd8..fcc02e1 100755
--- a/samples/tests/fail_fast.sh
+++ b/samples/tests/fail_fast.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./simple --fail-fast --always-succeed
+./simple.c.bin --fail-fast --always-succeed
diff --git a/samples/tests/help.sh b/samples/tests/help.sh
index 6b60bb5..6752cc6 100755
--- a/samples/tests/help.sh
+++ b/samples/tests/help.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-./simple --help
-./simple --version
+./simple.c.bin --help
+./simple.c.bin --version
diff --git a/samples/tests/list.sh b/samples/tests/list.sh
index 2040e54..6ab72bf 100755
--- a/samples/tests/list.sh
+++ b/samples/tests/list.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-./simple --list
-./simple --list --ascii
+./simple.c.bin --list
+./simple.c.bin --list --ascii
diff --git a/samples/tests/pattern.sh b/samples/tests/pattern.sh
index 09996f1..c1b10a9 100755
--- a/samples/tests/pattern.sh
+++ b/samples/tests/pattern.sh
@@ -1,10 +1,10 @@
 #!/bin/sh -e
-./simple --pattern '*/passing'
-./simple --pattern '!(*/passing)'
-./simple --pattern '[pf]a@(ss|il)ing'
-./simple --pattern '@(+(nest)ed))'
-./simple --pattern '?(*(a|b))'
-! ./simple --pattern '?(malformed'
-./simple --pattern '[!azerty]assing'
-./simple --pattern '|pipe'
-./simple --pattern '\!(escaped'
+./simple.c.bin --pattern '*/passing'
+./simple.c.bin --pattern '!(*/passing)'
+./simple.c.bin --pattern '[pf]a@(ss|il)ing'
+./simple.c.bin --pattern '@(+(nest)ed))'
+./simple.c.bin --pattern '?(*(a|b))'
+! ./simple.c.bin --pattern '?(malformed'
+./simple.c.bin --pattern '[!azerty]assing'
+./simple.c.bin --pattern '|pipe'
+./simple.c.bin --pattern '\!(escaped'
diff --git a/samples/tests/tap_test.sh b/samples/tests/tap_test.sh
index 38c0ac3..5e81fbf 100755
--- a/samples/tests/tap_test.sh
+++ b/samples/tests/tap_test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-./simple --tap --always-succeed
-./signal --tap --always-succeed
-./asserts --tap --always-succeed
-./more-suites --tap --always-succeed
-./long-messages --tap --always-succeed
-./description --tap --always-succeed
+./simple.c.bin --tap --always-succeed
+./signal.c.bin --tap --always-succeed
+./asserts.c.bin --tap --always-succeed
+./more-suites.c.bin --tap --always-succeed
+./long-messages.c.bin --tap --always-succeed
+./description.c.bin --tap --always-succeed
diff --git a/samples/tests/verbose.sh b/samples/tests/verbose.sh
index 73410b8..6bb1ef2 100755
--- a/samples/tests/verbose.sh
+++ b/samples/tests/verbose.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-./simple --verbose --always-succeed
+./simple.c.bin --verbose --always-succeed