diff --git a/bddtests/environments/orderer-1-kafka-1/docker-compose.yml b/bddtests/environments/orderer-1-kafka-1/docker-compose.yml
index 586e3b72571..78d158452a6 100644
--- a/bddtests/environments/orderer-1-kafka-1/docker-compose.yml
+++ b/bddtests/environments/orderer-1-kafka-1/docker-compose.yml
@@ -7,13 +7,16 @@ services:
   orderer0:
     image: hyperledger/fabric-orderer
     environment:
+        - ORDERER_GENERAL_ORDERERTYPE=kafka
         - ORDERER_GENERAL_LEDGERTYPE=ram
         - ORDERER_GENERAL_BATCHTIMEOUT=10s
         - ORDERER_GENERAL_BATCHSIZE=10
+        - ORDERER_GENERAL_QUEUESIZE=1000
         - ORDERER_GENERAL_MAXWINDOWSIZE=1000
         - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+        - ORDERER_GENERAL_LISTENPORT=7050
+        - ORDERER_GENERAL_GENESISMETHOD=provisional
         - ORDERER_RAMLEDGER_HISTORY_SIZE=100
-        - ORDERER_GENERAL_ORDERERTYPE=kafka
         - ORDERER_KAFKA_BROKERS=[kafka0:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
diff --git a/bddtests/environments/orderer-1-kafka-3/docker-compose.yml b/bddtests/environments/orderer-1-kafka-3/docker-compose.yml
index 8e281fc38ac..8234189b39e 100644
--- a/bddtests/environments/orderer-1-kafka-3/docker-compose.yml
+++ b/bddtests/environments/orderer-1-kafka-3/docker-compose.yml
@@ -7,13 +7,16 @@ services:
   orderer0:
     image: hyperledger/fabric-orderer
     environment:
+      - ORDERER_GENERAL_ORDERERTYPE=kafka
       - ORDERER_GENERAL_LEDGERTYPE=ram
       - ORDERER_GENERAL_BATCHTIMEOUT=10s
       - ORDERER_GENERAL_BATCHSIZE=10
+      - ORDERER_GENERAL_QUEUESIZE=1000
       - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - ORDERER_GENERAL_LISTENPORT=7050
+      - ORDERER_GENERAL_GENESISMETHOD=provisional
       - ORDERER_RAMLEDGER_HISTORY_SIZE=100
-      - ORDERER_GENERAL_ORDERERTYPE=kafka
       - ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
diff --git a/bddtests/environments/orderer-n-kafka-n/docker-compose.yml b/bddtests/environments/orderer-n-kafka-n/docker-compose.yml
index 7d6d991e7c0..47c8f1fcc59 100644
--- a/bddtests/environments/orderer-n-kafka-n/docker-compose.yml
+++ b/bddtests/environments/orderer-n-kafka-n/docker-compose.yml
@@ -8,6 +8,15 @@ services:
     build: ./orderer
     environment:
       - ORDERER_GENERAL_ORDERERTYPE=kafka
+      - ORDERER_GENERAL_LEDGERTYPE=ram
+      - ORDERER_GENERAL_BATCHTIMEOUT=10s
+      - ORDERER_GENERAL_BATCHSIZE=10
+      - ORDERER_GENERAL_QUEUESIZE=1000
+      - ORDERER_GENERAL_MAXWINDOWSIZE=1000
+      - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - ORDERER_GENERAL_LISTENPORT=7050
+      - ORDERER_GENERAL_GENESISMETHOD=provisional
+      - ORDERER_RAMLEDGER_HISTORY_SIZE=100
     depends_on:
       - zookeeper
       - kafka
diff --git a/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile b/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile
index 2e30af8e491..6d4c3fe0838 100644
--- a/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile
+++ b/bddtests/environments/orderer-n-kafka-n/orderer/Dockerfile
@@ -1,13 +1,5 @@
 FROM hyperledger/fabric-orderer
-ENV ORDERER_GENERAL_LEDGERTYPE=ram \
-    ORDERER_GENERAL_BATCHTIMEOUT=10s \
-    ORDERER_GENERAL_BATCHSIZE=10 \
-    ORDERER_GENERAL_MAXWINDOWSIZE=1000 \
-    ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 \
-    ORDERER_GENERAL_LISTENPORT=5005 \
-    ORDERER_RAMLEDGER_HISTORY_SIZE=100
 WORKDIR /opt/gopath/src/github.com/hyperledger/fabric/orderer
-ENV ORDERER_GENERAL_ORDERERTYPE=kafka
 RUN apt-get update \
     && apt-get install -y zookeeper jq \
     && rm -rf /var/lib/apt/lists/*