diff --git a/.github/scripts/build-examples.sh b/.github/scripts/build-examples.sh
index 6aee7c8..e45ab3a 100755
--- a/.github/scripts/build-examples.sh
+++ b/.github/scripts/build-examples.sh
@@ -54,20 +54,20 @@ fi
 
 # activate conda and enter example dir
 
-snippets="export-install-dir,fpga-fam-$fpga_family,conda-prep-env,conda-act-env,enter-dir-$fpga_family"
+snippets="docs/building-examples.rst:export-install-dir,fpga-fam-$fpga_family,conda-prep-env,conda-act-env,enter-dir-$fpga_family"
 
 # Xilinx 7-Series examples
 if [ "$fpga_family" = "xc7" ]; then
     for example in $examples; do
         case $example in
             "counter")
-                snippets="${snippets},example-counter-*-group"
+                snippets="${snippets} xc7/counter_test/README.rst:example-counter-*-group"
                 ;;
             "picosoc")
-                snippets="${snippets},xc7/picosoc_demo/README.rst,example-picosoc-*-group"
+                snippets="${snippets} xc7/picosoc_demo/README.rst:example-picosoc-*-group"
                 ;;
             "litex_linux")
-                snippets="${snippets},xc7/linux_litex_demo/README.rst,example-litex-deps,example-litex-*-group"
+                snippets="${snippets} xc7/linux_litex_demo/README.rst:example-litex-deps,example-litex-*-group"
                 ;;
              *)
                 echo "ERROR: Unknown example name: $example" >&2
@@ -80,7 +80,7 @@ elif [ "$fpga_family" = "eos-s3" ]; then
     for example in $examples; do
         case $example in
             "counter")
-                snippets="${snippets},eos-s3-counter"
+                snippets="${snippets} eos-s3/btn_counter/README.rst:eos-s3-counter"
                 ;;
              *)
                 echo "ERROR: Unknown example name: $example" >&2
@@ -94,4 +94,4 @@ else
 fi
 
 # call tuttest
-tuttest_exec docs/building-examples.rst ${snippets}
+tuttest_exec ${snippets}
diff --git a/.github/scripts/install-toolchain.sh b/.github/scripts/install-toolchain.sh
index 816e13d..3a8c7b4 100755
--- a/.github/scripts/install-toolchain.sh
+++ b/.github/scripts/install-toolchain.sh
@@ -45,4 +45,4 @@ fi
 fpga_family=$1
 os=$2
 
-tuttest_exec docs/getting-symbiflow.rst install-reqs-$os,wget-conda,conda-install-dir,fpga-fam-$fpga_family,conda-setup,download-arch-def-$fpga_family
+tuttest_exec docs/getting-symbiflow.rst:install-reqs-$os,wget-conda,conda-install-dir,fpga-fam-$fpga_family,conda-setup,download-arch-def-$fpga_family
diff --git a/.github/workflows/sphinx-tuttest.yml b/.github/workflows/sphinx-tuttest.yml
index 4f41f56..d338485 100644
--- a/.github/workflows/sphinx-tuttest.yml
+++ b/.github/workflows/sphinx-tuttest.yml
@@ -64,7 +64,7 @@ jobs:
 
       - name: Install tuttest
         run: |
-          wget https://github.com/antmicro/tuttest/releases/download/0.1.1/tuttest -O /usr/bin/tuttest
+          wget https://github.com/antmicro/tuttest/releases/download/v0.2-beta/tuttest -O /usr/bin/tuttest
           chmod a+rx /usr/bin/tuttest
 
       - name: Install SymbiFlow toolchain