diff --git a/.travis.yml b/.travis.yml
index 22d5e8b..2c85c9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,52 +7,53 @@ services:
 
 env:
   # Testing QuickLogic toolchain on all OSes
-  - TOOLCHAIN=quicklogic      OS=ubuntu OS_VERSION=trusty
-  - TOOLCHAIN=quicklogic      OS=ubuntu OS_VERSION=xenial
-  - TOOLCHAIN=quicklogic      OS=ubuntu OS_VERSION=bionic
-  - TOOLCHAIN=quicklogic      OS=ubuntu OS_VERSION=eoan
-  - TOOLCHAIN=quicklogic      OS=ubuntu OS_VERSION=focal
-  - TOOLCHAIN=quicklogic      OS=centos OS_VERSION=6
-  - TOOLCHAIN=quicklogic      OS=centos OS_VERSION=7
-  - TOOLCHAIN=quicklogic      OS=centos OS_VERSION=8
+  - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=trusty
+  - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=xenial
+  - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=bionic
+  - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=eoan
+  - TOOLCHAIN=eos-s3 OS=ubuntu OS_VERSION=focal
+  - TOOLCHAIN=eos-s3 OS=centos OS_VERSION=6
+  - TOOLCHAIN=eos-s3 OS=centos OS_VERSION=7
+  - TOOLCHAIN=eos-s3 OS=centos OS_VERSION=8
   # Testing Xilinx 7 Series toolchain on all OSes
-  - TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=trusty
-  - TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=xenial
-  - TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=bionic
-  - TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=eoan
-  - TOOLCHAIN=xilinx-series-7 OS=ubuntu OS_VERSION=focal
-  - TOOLCHAIN=xilinx-series-7 OS=centos OS_VERSION=6
-  - TOOLCHAIN=xilinx-series-7 OS=centos OS_VERSION=7
-  - TOOLCHAIN=xilinx-series-7 OS=centos OS_VERSION=8
+  - TOOLCHAIN=xc7    OS=ubuntu OS_VERSION=trusty
+  - TOOLCHAIN=xc7    OS=ubuntu OS_VERSION=xenial
+  - TOOLCHAIN=xc7    OS=ubuntu OS_VERSION=bionic
+  - TOOLCHAIN=xc7    OS=ubuntu OS_VERSION=eoan
+  - TOOLCHAIN=xc7    OS=ubuntu OS_VERSION=focal
+  - TOOLCHAIN=xc7    OS=centos OS_VERSION=6
+  - TOOLCHAIN=xc7    OS=centos OS_VERSION=7
+  - TOOLCHAIN=xc7    OS=centos OS_VERSION=8
 
 before_install:
-        - sudo locale-gen "en_US.UTF-8"
-        - export LANG="en_US.UTF-8"
-        - source .github/travis/common.sh
-        - rm README.rst && make README.rst && .github/travis/git-check.sh
-        - pip install git+https://github.com/antmicro/tuttest#egg=tuttest
-
-install:
+ - sudo locale-gen "en_US.UTF-8"
+ - export LANG="en_US.UTF-8"
+ - source .github/travis/common.sh
+ # Get tuttest and setup a docker container to run the test in.
+ - pip install git+https://github.com/antmicro/tuttest#egg=tuttest
  - export DOCKER_NAME=test
  - export IN_DOCKER_EXEC="docker exec -t $DOCKER_NAME bash -c"
  - docker create
-        --name $DOCKER_NAME
-        --env LANG="en_US.UTF-8"
-        --env LANGUAGE="en_US"
-        --env DEBIAN_FRONTEND="noninteractive"
-        --env INSTALL_DIR=~/opt/symbiflow/
-        -v /home/travis:/home/travis
-        --workdir $PWD
-        --tty
-        $OS:$OS_VERSION
+       --name $DOCKER_NAME
+       --env LANG="en_US.UTF-8"
+       --env LANGUAGE="en_US"
+       --env DEBIAN_FRONTEND="noninteractive"
+       --env INSTALL_DIR=~/opt/symbiflow/
+       -v /home/travis:/home/travis
+       --workdir $PWD
+       --tty
+       $OS:$OS_VERSION
  - docker start $DOCKER_NAME
- - if [ "$OS" = "ubuntu" ]; then tuttest README.rst install-wget-ubuntu --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi
- - if [ "$OS" = "centos" ]; then tuttest README.rst install-wget-centos --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi
+
+install:
+ # Check the top level README file is up to date.
+ - rm README.rst && make README.rst && .github/travis/git-check.sh
+ # Install the toolchain into the docker container.
+ - tuttest README.rst install-wget-${OS} --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
  - tuttest README.rst wget-conda --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
- - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst xc7-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi
- - if [ "$TOOLCHAIN" = "quicklogic" ];      then tuttest eos-s3/README.rst eoss3-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -; fi
+ - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-setup-toolchain --prefix-lines-with "$IN_DOCKER_EXEC" | bash -ex -
 
 script:
- - if [ "$TOOLCHAIN" = "xilinx-series-7" ]; then tuttest xc7/README.rst xc7-prepare-env,xc7-counter,xc7-picosoc,xc7-litex,xc7-linux --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex -; fi
- - if [ "$TOOLCHAIN" = "quicklogic" ];      then tuttest eos-s3/README.rst eoss3-prepare-env,eoss3-counter --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex -; fi
-
+ # Run the tests inside the docker container.
+ - if [ "$TOOLCHAIN" = "xc7" ]; then EXTRA_TESTS=,xc7-picosoc,xc7-litex,xc7-linux; fi
+ - tuttest ${TOOLCHAIN}/README.rst ${TOOLCHAIN}-prepare-env,${TOOLCHAIN}-counter${EXTRA_TESTS} --prefix-lines-with "$IN_DOCKER_EXEC" --single-command | bash -ex -
diff --git a/README.rst b/README.rst
index 43b3bf0..e605d2b 100644
--- a/README.rst
+++ b/README.rst
@@ -95,7 +95,7 @@ and so you will need to add some ``sudo`` commands to the instructions below.
 * For the EOS S3 devices:
 
 .. code:: bash
-        :name: eoss3-setup-toolchain
+        :name: eos-s3-setup-toolchain
 
         bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
         source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@@ -184,7 +184,7 @@ Before building any example, set the installation directory to match what you se
 and prepare the environment:
 
 .. code:: bash
-        :name: eoss3-prepare-env
+        :name: eos-s3-prepare-env
 
         export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
         source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@@ -193,7 +193,7 @@ and prepare the environment:
 To build the example, run the following command:
 
 .. code:: bash
-        :name: eoss3-counter
+        :name: eos-s3-counter
 
         pushd eos-s3/btn_counter && make && popd
 
diff --git a/eos-s3/README.rst b/eos-s3/README.rst
index ef166a2..addcf4a 100644
--- a/eos-s3/README.rst
+++ b/eos-s3/README.rst
@@ -27,7 +27,7 @@ Choose the installation directory (see the `README <../README.rst>`_ one level u
 .. toolchain_include_begin_label
 
 .. code:: bash
-        :name: eoss3-setup-toolchain
+        :name: eos-s3-setup-toolchain
 
         bash conda_installer.sh -b -p $INSTALL_DIR/eos-s3/conda
         source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@@ -52,7 +52,7 @@ Before building any example, set the installation directory to match what you se
 and prepare the environment:
 
 .. code:: bash
-        :name: eoss3-prepare-env
+        :name: eos-s3-prepare-env
 
         export PATH="$INSTALL_DIR/eos-s3/install/bin:$PATH"
         source "$INSTALL_DIR/eos-s3/conda/etc/profile.d/conda.sh"
@@ -61,7 +61,7 @@ and prepare the environment:
 To build the example, run the following command:
 
 .. code:: bash
-        :name: eoss3-counter
+        :name: eos-s3-counter
 
         pushd eos-s3/btn_counter && make && popd