diff --git a/bddtests/compose-defaults.yml b/bddtests/compose-defaults.yml
index 0c3be5a8698..5bb1445f009 100644
--- a/bddtests/compose-defaults.yml
+++ b/bddtests/compose-defaults.yml
@@ -8,7 +8,7 @@ vp:
   # Script will wait until membersrvc is up (if it exists) before starting
   # $$GOPATH (double dollar) required to prevent docker-compose doing its own
   # substitution before the value gets to the container
-  command: sh -c '$$GOPATH/src/github.com/hyperledger/fabric/bddtests/scripts/start-peer.sh'
+  command: sh -c "exec $$GOPATH/src/github.com/hyperledger/fabric/bddtests/scripts/start-peer.sh"
 
   # Use these options if coverage desired for peers
   #image: hyperledger/fabric-peer-coverage
diff --git a/bddtests/docker-compose-1-devmode.yml b/bddtests/docker-compose-1-devmode.yml
index 7f506bd1dd8..a29e936b6b3 100755
--- a/bddtests/docker-compose-1-devmode.yml
+++ b/bddtests/docker-compose-1-devmode.yml
@@ -4,7 +4,7 @@ vp0:
     service: vp
   environment:
     - CORE_PEER_ID=vp0
-  command: sh -c "peer node start --peer-chaincodedev"
+  command: peer node start --peer-chaincodedev
 
 ccenv:
   image: hyperledger/fabric-ccenv
@@ -13,6 +13,10 @@ ccenv:
     - CORE_PEER_ADDRESS=vp0:7051
   # $$GOPATH (double dollar) required to prevent docker-compose doing its own
   # substitution before the value gets to the container
-  command: bash -c 'go install github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 && $$GOPATH/bin/chaincode_example02'
+  command: |
+    sh -c "
+      go install github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02
+      exec $$GOPATH/bin/chaincode_example02
+    "
   links:
     - vp0
diff --git a/bddtests/scripts/start-peer.sh b/bddtests/scripts/start-peer.sh
index cd6965fdfd9..c05b36d8108 100755
--- a/bddtests/scripts/start-peer.sh
+++ b/bddtests/scripts/start-peer.sh
@@ -16,5 +16,5 @@ else
     echo "No membersrvc to wait for, starting immediately"
 fi
 
-peer node start
+exec peer node start