diff --git a/images/testenv/Dockerfile.in b/images/testenv/Dockerfile.in
index bef1473e0b2..ea226a2367c 100644
--- a/images/testenv/Dockerfile.in
+++ b/images/testenv/Dockerfile.in
@@ -3,6 +3,8 @@ FROM hyperledger/fabric-buildenv:_TAG_
 # fabric configuration locations
 ENV PEER_CFG_PATH /etc/hyperledger/fabric
 ENV ORDERER_CFG_PATH /etc/hyperledger/fabric
+ENV CORE_PEER_MSPCONFIGPATH $PEER_CFG_PATH/msp/sampleconfig
+ENV ORDERER_GENERAL_LOCALMSPDIR $ORDERER_CFG_PATH/msp/sampleconfig
 
 # create needed directories
 RUN mkdir -p \
diff --git a/orderer/orderer.yaml b/orderer/orderer.yaml
index 02c5a977e99..97dc4652413 100644
--- a/orderer/orderer.yaml
+++ b/orderer/orderer.yaml
@@ -55,7 +55,7 @@ General:
     # LocalMSPDir is where to find the crypto material needed for signing in the orderer
     # It is set relative here as a default for dev environments but should be changed to the
     # real location in production
-    LocalMSPDir: ../msp/
+    LocalMSPDir: msp/sampleconfig
 
     # LocalMSPID is the identity to register the local MSP material with the MSP manager
     # ----!!!!IMPORTANT!!!-!!!IMPORTANT!!!-!!!IMPORTANT!!!!----