diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index ed32c7f..002b00a 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -224,6 +224,7 @@
           build-timeout: 30
           docker-repo: 'omecproject'
           build-node: 'ubuntu16.04-basebuild-2c-4g'
+          extraEnvironmentVars: CPU=haswell
 
 # Combined pipeline
 - job-template:
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 83b54e5..1be36fa 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -265,6 +265,9 @@
             _TAG=$_TAG bash $WORKSPACE/pprof.sh &
           fi
         '''
+        // bbsim-sadis server takes a while to cache the subscriber entries
+        // wait for that before starting the tests
+        sleep(60)
         timeout(time: 11, unit: 'MINUTES') {
           sh '''
             ROBOT_PARAMS="-v olt:${olts} \