diff --git a/internal/bbsim/devices/onu.go b/internal/bbsim/devices/onu.go
index a62d240..d6962c1 100644
--- a/internal/bbsim/devices/onu.go
+++ b/internal/bbsim/devices/onu.go
@@ -932,7 +932,7 @@
 			"FlowId":       downstreamFlow.FlowId,
 			"PortNo":       downstreamFlow.PortNo,
 			"SerialNumber": common.OnuSnToString(o.SerialNumber),
-		}).Fatalf("Failed to EAPOL Flow")
+		}).Fatalf("Failed to add EAPOL Flow")
 	}
 	log.WithFields(log.Fields{
 		"IntfId":       o.PonPortID,
diff --git a/tests/bbr.groovy b/tests/bbr.groovy
index 104b750..5223c40 100644
--- a/tests/bbr.groovy
+++ b/tests/bbr.groovy
@@ -43,7 +43,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 4 -onu 16" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 4 -onu 16" make docker-run
             sleep 5
             ./bbr -pon 4 -onu 16 -logfile bbr_16_4.logs
             docker logs bbsim 2>&1 | tee bbsim_16_4.logs
@@ -57,7 +57,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 4 -onu 32" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 4 -onu 32" make docker-run
             sleep 5
             ./bbr -pon 4 -onu 32 -logfile bbr_32_4.logs
             docker logs bbsim 2>&1 | tee bbsim_32_4.logs
@@ -71,7 +71,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 8 -onu 32" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 8 -onu 32" make docker-run
             sleep 5
             ./bbr -pon 8 -onu 32 -logfile bbr_32_8.logs
             docker logs bbsim 2>&1 | tee bbsim_32_8.logs
@@ -85,7 +85,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 8 -onu 64" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 8 -onu 64" make docker-run
             sleep 5
             ./bbr -pon 8 -onu 64 -logfile bbr_64_8.logs
             docker logs bbsim 2>&1 | tee bbsim_64_8.logs
@@ -99,7 +99,7 @@
         timeout(1) {
           sh """
             docker rm -f bbsim || true
-            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 15 -onu 64" make docker-run
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-enableperf -auth -dhcp -pon 15 -onu 64" make docker-run
             sleep 5
             ./bbr -pon 15 -onu 64 -logfile bbr_64_15.logs
             docker logs bbsim 2>&1 | tee bbsim_64_15.logs