diff --git a/.travis.yml b/.travis.yml
index 94ba1ed..66cee0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,16 +13,16 @@
 
 cache: cargo
 
-# Once Travis supports a version of Ubuntu Disco or newer we can apt install QEMU for RISC-V
+# Once Travis supports a version of Ubuntu that inlcudes QEMU 5.1+
+#    we can apt install QEMU for RISC-V.
 # Until then we need to build it ourselves
 before_install:
   #   - sudo apt-get -y install qemu-system-misc
   # addons:
   #   apt:
   #     update: true
-  - wget https://download.qemu.org/qemu-4.2.0.tar.xz
-  - tar xJf qemu-4.2.0.tar.xz
-  - pushd qemu-4.2.0
+  - git clone https://github.com/alistair23/qemu.git -b riscv-tock.next
+  - pushd qemu
   - ./configure --target-list=riscv32-softmmu
   - make -j8
   - sudo ln -s $PWD/riscv32-softmmu/qemu-system-riscv32 /usr/bin/
@@ -35,7 +35,7 @@
   - git clone https://github.com/tock/tock.git
   - cd tock/boards/hifive1
   # Use a known working version of Tock
-  - git checkout c94059d3e25dc635e682facff4894ef43b9aca0e
+  - git checkout 152189fe077aea955332ee3c28ccbee519d8b072
   - make
   - popd
 
diff --git a/boards/layout_hifive1.ld b/boards/layout_hifive1.ld
index e9bd9d0..2e08580 100644
--- a/boards/layout_hifive1.ld
+++ b/boards/layout_hifive1.ld
@@ -9,7 +9,7 @@
    * Note that the SRAM address may need to be changed depending on
    * the kernel binary, check for the actual address of APP_MEMORY!
    */
-  FLASH (rx) : ORIGIN = 0x20430040, LENGTH = 32M
+  FLASH (rx) : ORIGIN = 0x20040040, LENGTH = 32M
   SRAM (rwx) : ORIGIN = 0x80002400, LENGTH = 0x1C00
 }
 
diff --git a/test-runner/src/main.rs b/test-runner/src/main.rs
index 0ee3455..99b941c 100644
--- a/test-runner/src/main.rs
+++ b/test-runner/src/main.rs
@@ -16,11 +16,11 @@
 
     let  tests = Command::new("qemu-system-riscv32")
         .arg("-M")
-        .arg("sifive_e")
+        .arg("sifive_e,revb=true")
         .arg("-kernel")
-        .arg("../../tock/boards/hifive1/target/riscv32imac-unknown-none-elf/release/hifive1")
+        .arg("../../tock/target/riscv32imac-unknown-none-elf/release/hifive1")
         .arg("-device")
-        .arg("loader,file=./../target/riscv32imac-unknown-none-elf/tab/hifive1/libtock_test/rv32imac.tbf,addr=0x20430000")
+        .arg("loader,file=./../target/riscv32imac-unknown-none-elf/tab/hifive1/libtock_test/rv32imac.tbf,addr=0x20040000")
         .arg("-nographic")
         .stdout(Stdio::piped())
         .kill_on_drop(true)