diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml
index a635dcf486d..033316d6720 100644
--- a/core/chaincode/chaincodetest.yaml
+++ b/core/chaincode/chaincodetest.yaml
@@ -301,7 +301,7 @@ peer:
         touchMaxNodes: 100
 
     # Path on the file system where peer will store data
-    fileSystemPath: /var/hyperledger/test/tmpdb
+    fileSystemPath: /tmp/hyperledger/test/tmpdb
 
 
     profile:
diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
index 2811bb7cdf7..cac219c35c8 100644
--- a/core/chaincode/exectransaction_test.go
+++ b/core/chaincode/exectransaction_test.go
@@ -1107,6 +1107,7 @@ var signer msp.SigningIdentity
 
 func TestMain(m *testing.M) {
 	var err error
+
 	primitives.SetSecurityLevel("SHA2", 256)
 
 	// setup the MSP manager so that we can sign/verify
diff --git a/core/chaincode/systemchaincode_test.go b/core/chaincode/systemchaincode_test.go
index 37eaf0d9cb1..4756b1a099e 100644
--- a/core/chaincode/systemchaincode_test.go
+++ b/core/chaincode/systemchaincode_test.go
@@ -44,8 +44,8 @@ func (osyscc *oldSysCCInfo) reset() {
 func initSysCCTests() (*oldSysCCInfo, net.Listener, error) {
 	var opts []grpc.ServerOption
 	grpcServer := grpc.NewServer(opts...)
-	viper.Set("peer.fileSystemPath", "/var/hyperledger/test/tmpdb")
-	defer os.RemoveAll("/var/hyperledger/test/tmpdb")
+	viper.Set("peer.fileSystemPath", "/tmp/hyperledger/test/tmpdb")
+	defer os.RemoveAll("/tmp/hyperledger/test/tmpdb")
 
 	peer.MockInitialize()