diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
index 4f2beed6442..1c3d4e62090 100644
--- a/core/chaincode/exectransaction_test.go
+++ b/core/chaincode/exectransaction_test.go
@@ -471,6 +471,8 @@ func _(chainID string, _ string) error {
 
 // Test deploy of a transaction
 func TestExecuteDeployTransaction(t *testing.T) {
+	//chaincoe is deployed as part of many tests. No need for a separate one for this
+	t.Skip()
 	chainID := util.GetTestChainID()
 
 	executeDeployTransaction(t, chainID, "example01", "github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example01")
@@ -478,6 +480,8 @@ func TestExecuteDeployTransaction(t *testing.T) {
 
 // Test deploy of a transaction with a GOPATH with multiple elements
 func TestGopathExecuteDeployTransaction(t *testing.T) {
+	//this is no longer critical as chaincode is assembled in the client side (SDK)
+	t.Skip()
 	chainID := util.GetTestChainID()
 
 	// add a trailing slash to GOPATH
@@ -1041,6 +1045,9 @@ func TestGetEvent(t *testing.T) {
 // Test the execution of a chaincode that queries another chaincode
 // example02 implements "query" as a function in Invoke. example05 calls example02
 func TestChaincodeQueryChaincodeUsingInvoke(t *testing.T) {
+	//this is essentially same as the ChaincodeInvokeChaincode now that
+	//we don't distinguish between Invoke and Query (there's no separate "Query")
+	t.Skip()
 	chainID := util.GetTestChainID()
 
 	var peerLis net.Listener
diff --git a/core/chaincode/multichains_test.go b/core/chaincode/multichains_test.go
index 289760f41a2..3c140418121 100644
--- a/core/chaincode/multichains_test.go
+++ b/core/chaincode/multichains_test.go
@@ -26,7 +26,8 @@ import (
 )
 
 func TestExecuteInvokeOnManyChains(t *testing.T) {
-	chains := []string{"chain1", "chain2", "chain3", "chain4"}
+	//lets use 2 chains to test multi chains
+	chains := []string{"chain1", "chain2"}
 	lis, err := initPeer(chains...)
 	if err != nil {
 		t.Fail()