diff --git a/Jenkinsfile b/Jenkinsfile
index 78a3a0fa63..8cc505654b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -83,7 +83,6 @@ pipeline {
         }
       }
 
-
       stages {
 
         /*
@@ -121,17 +120,12 @@ pipeline {
           stages {
             stage('parallel tests') {
               parallel {
-                stage('Devel Build') {
-                  environment {
-                    CI_PUSH = "${env.BRANCH_NAME == 'master' ? 'master-ci' : ' '}"
-                  }
+                stage('Devel Tests') {
                   steps {
                     phone_steps("eon-build", [
-                      ["build", "SCONS_CACHE=1 scons -j4"],
-                      ["test athena", "nosetests -s selfdrive/athena/tests/test_athenad_old.py"],
+                      ["build devel", "cd release && SCONS_CACHE=1 DEVEL_TEST=1 ./build_devel.sh"],
                       ["test manager", "python selfdrive/manager/test/test_manager.py"],
                       ["onroad tests", "cd selfdrive/test/ && ./test_onroad.py"],
-                      ["build devel", "cd release && CI_PUSH=${env.CI_PUSH} ./build_devel.sh"],
                       ["test car interfaces", "cd selfdrive/car/tests/ && ./test_car_interfaces.py"],
                     ])
                   }
@@ -150,6 +144,7 @@ pipeline {
                   steps {
                     phone_steps("eon", [
                       ["build", "SCONS_CACHE=1 scons -j4"],
+                      ["test athena", "nosetests -s selfdrive/athena/tests/test_athenad_old.py"],
                       ["test sounds", "nosetests -s selfdrive/test/test_sounds.py"],
                       ["test boardd loopback", "nosetests -s selfdrive/boardd/tests/test_boardd_loopback.py"],
                       ["test loggerd", "python selfdrive/loggerd/tests/test_loggerd.py"],
@@ -196,6 +191,18 @@ pipeline {
 
               }
             }
+
+            stage('Push master-ci') {
+              when {
+                branch 'master'
+              }
+              steps {
+                phone_steps("eon-build", [
+                  ["push devel", "cd release && CI_PUSH='masetr-ci' ./build_devel.sh"],
+                ])
+              }
+            }
+
           }
 
           post {
diff --git a/release/build_devel.sh b/release/build_devel.sh
index 262814f0d0..601edc4f37 100755
--- a/release/build_devel.sh
+++ b/release/build_devel.sh
@@ -51,6 +51,11 @@ echo "[-] copying files T=$SECONDS"
 cd $SOURCE_DIR
 cp -pR --parents $(cat release/files_common) $TARGET_DIR/
 
+# test files
+if [ ! -z "$DEVEL_TEST" ]; then
+  cp -pR --parents tools/ $TARGET_DIR/
+fi
+
 # in the directory
 cd $TARGET_DIR
 
diff --git a/release/files_common b/release/files_common
index 598815386e..f76daaa31c 100644
--- a/release/files_common
+++ b/release/files_common
@@ -333,6 +333,7 @@ selfdrive/test/__init__.py
 selfdrive/test/helpers.py
 selfdrive/test/setup_device_ci.sh
 selfdrive/test/test_fingerprints.py
+selfdrive/test/test_onroad.py
 
 selfdrive/ui/.gitignore
 selfdrive/ui/SConscript