diff --git a/tests/build/Dockerfile b/tests/build/Dockerfile
index e0313c10cce2e9..cc9f0c46368d4f 100644
--- a/tests/build/Dockerfile
+++ b/tests/build/Dockerfile
@@ -2,16 +2,6 @@ FROM ubuntu:16.04
 
 RUN apt-get update && apt-get install -y gcc-arm-none-eabi libnewlib-arm-none-eabi python python-pip gcc g++ git autoconf gperf bison flex automake texinfo wget help2man gawk libtool libtool-bin ncurses-dev unzip unrar-free libexpat-dev sed bzip2 locales curl zlib1g-dev libffi-dev libssl-dev
 
-# Build esp toolchain
-RUN mkdir -p /panda/boardesp
-WORKDIR /panda/boardesp
-RUN git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
-WORKDIR /panda/boardesp/esp-open-sdk
-RUN git checkout 03f5e898a059451ec5f3de30e7feff30455f7ce
-RUN CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y
-
-COPY . /panda
-
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
@@ -26,4 +16,14 @@ RUN pyenv rehash
 
 RUN pip install pycrypto==2.6.1
 
+# Build esp toolchain
+RUN mkdir -p /panda/boardesp
+WORKDIR /panda/boardesp
+RUN git clone --recursive https://github.com/pfalcon/esp-open-sdk.git
+WORKDIR /panda/boardesp/esp-open-sdk
+RUN git checkout 03f5e898a059451ec5f3de30e7feff30455f7ce
+RUN CT_ALLOW_BUILD_AS_ROOT_SURE=1 make STANDALONE=y
+
+COPY . /panda
+
 WORKDIR /panda