diff --git a/Jenkinsfile b/Jenkinsfile
index 76718a59..1284ca4f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
                 docker {
                     image 'hackrf'
                     reuseNode true
-                    args '--group-add=20 --group-add=46 --device-cgroup-rule="c 189:* rmw" --device-cgroup-rule="c 166:* rmw" -v /dev/bus/usb:/dev/bus/usb -e TESTER=0000000000000000325866e629a25623 -e EUT=RunningFromRAM'
+                    args '--group-add=20 --group-add=46 --device-cgroup-rule="c 189:* rmw" --device-cgroup-rule="c 166:* rmw" -v /dev/bus/usb:/dev/bus/usb -e TESTER=0000000000000000325866e629a25623 -e EUT=RunningFromRAM -v /tmp/req_pipe:/tmp/req_pipe -v /tmp/res_pipe:/tmp/res_pipe'
                 }
             }
             steps {
@@ -19,15 +19,21 @@ pipeline {
                 sh './ci-scripts/install-firmware.sh'
                 sh 'hubs all off'
                 retry(3) {
+                    sh 'hubs h1_eut reset'
+                    sh 'sleep 1s'
                     sh './ci-scripts/test-host.sh'
                 }
-                sh 'hubs hackrf hackrf_dfu on'
-                sh 'python3 ci-scripts/hackrf_test.py --unattended --ci --log log --rev r4 --manufacturer --hostdir host/build/hackrf-tools/src/ --fwupdate firmware/hackrf_usb/build/ --tester 0000000000000000325866e629a25623 --eut RunningFromRAM'
-                sh 'hubs all off'
                 retry(3) {
+                    sh 'hubs h1_tester h1_eut reset'
+                    sh 'sleep 1s'
+                    sh 'python3 ci-scripts/hackrf_test.py --unattended --ci --log log --rev r4 --manufacturer --hostdir host/build/hackrf-tools/src/ --fwupdate firmware/hackrf_usb/build/ --tester 0000000000000000325866e629a25623 --eut RunningFromRAM'
+                    sh 'hubs all off'
+                }
+                retry(3) {
+                    sh 'hubs h1_eut reset'
+                    sh 'sleep 1s'
                     sh 'python3 ci-scripts/test-sgpio-debug.py'
                 }
-                sh 'hubs all reset'
             }
         }
     }
diff --git a/ci-scripts/test-firmware-program.sh b/ci-scripts/test-firmware-program.sh
index a9e786a7..26be84c6 100755
--- a/ci-scripts/test-firmware-program.sh
+++ b/ci-scripts/test-firmware-program.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-hubs hackrf_dfu reset
-sleep 1s
 dfu-util --device 1fc9:000c --alt 0 --download firmware/hackrf_usb/build/hackrf_usb.dfu
 sleep 1s
 EXIT_CODE="$?"
diff --git a/ci-scripts/test-host.sh b/ci-scripts/test-host.sh
index 903fefd0..5cc8b621 100755
--- a/ci-scripts/test-host.sh
+++ b/ci-scripts/test-host.sh
@@ -1,6 +1,4 @@
 #!/bin/bash
-hubs hackrf_dfu reset
-sleep 1s
 host/build/hackrf-tools/src/hackrf_info
 EXIT_CODE="$?"
 if [ "$EXIT_CODE" == "1" ]