diff --git a/plat/juno/bl1_plat_setup.c b/plat/juno/bl1_plat_setup.c
index 96dc854..995cd7f 100644
--- a/plat/juno/bl1_plat_setup.c
+++ b/plat/juno/bl1_plat_setup.c
@@ -123,17 +123,12 @@
  ******************************************************************************/
 void bl1_plat_arch_setup(void)
 {
-	unsigned long cci_setup;
-
 	/*
 	 * Enable CCI-400 for this cluster. No need
 	 * for locks as no other cpu is active at the
 	 * moment
 	 */
-	cci_setup = platform_get_cfgvar(CONFIG_HAS_CCI);
-	if (cci_setup) {
-		cci_enable_coherency(read_mpidr());
-	}
+	cci_enable_coherency(read_mpidr());
 
 	configure_mmu(&bl1_tzram_layout,
 			TZROM_BASE,
diff --git a/plat/juno/platform.h b/plat/juno/platform.h
index 2728988..4a91519 100644
--- a/plat/juno/platform.h
+++ b/plat/juno/platform.h
@@ -160,8 +160,8 @@
  * CCI-400 related constants
  ******************************************************************************/
 #define CCI400_BASE			0x2c090000
-#define CCI400_SL_IFACE_CLUSTER0	3
-#define CCI400_SL_IFACE_CLUSTER1	4
+#define CCI400_SL_IFACE_CLUSTER0	4
+#define CCI400_SL_IFACE_CLUSTER1	3
 #define CCI400_SL_IFACE_INDEX(mpidr)	(mpidr & MPIDR_CLUSTER_MASK ? \
 					 CCI400_SL_IFACE_CLUSTER1 :   \
 					 CCI400_SL_IFACE_CLUSTER0)