diff --git a/lib/client_test.go b/lib/client_test.go
index d189393b3..3975507e3 100644
--- a/lib/client_test.go
+++ b/lib/client_test.go
@@ -208,7 +208,7 @@ func TestIdemixEnroll(t *testing.T) {
 		t.Fatalf("Failed to store identity: %s", err.Error())
 	}
 
-	_, err = client.LoadIdentity("", filepath.Join(clientHome, "msp/signcerts/cert.pem"), filepath.Join(clientHome, "user/SignerConfig"))
+	_, err = client.LoadIdentity("", filepath.Join(clientHome, "msp/signcerts/cert.pem"), filepath.Join(clientHome, "msp/user/SignerConfig"))
 	assert.NoError(t, err, "Failed to load identity that has both X509 and Idemix credentials")
 
 	_, err = client.LoadIdentity("", "", filepath.Join(clientHome, "user/SignerConfig"))
diff --git a/scripts/fvt/idemix_test.sh b/scripts/fvt/idemix_test.sh
index 7a054adb1..595731726 100755
--- a/scripts/fvt/idemix_test.sh
+++ b/scripts/fvt/idemix_test.sh
@@ -38,7 +38,7 @@ function getIdemixCred() {
     $FABRIC_CA_CLIENTEXEC enroll -u "${PROTO}${USERNAME}:$USERPSWD@$CA_HOST_ADDRESS:$PROXY_PORT" -H $CA_CFG_PATH/$USERNAME --enrollment.type idemix -d $TLSOPT
     test $? -eq 0 || ErrorMsg "Failed to complete 'enroll' command"
 
-    CLIENTCERT="$CA_CFG_PATH/$USERNAME/user/SignerConfig"
+    CLIENTCERT="$CA_CFG_PATH/$USERNAME/msp/user/SignerConfig"
     if [ ! -f $CLIENTCERT ]; then
         ErrorMsg "Idemix credential was not stored in the correct location"
     fi