diff --git a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig
index 709097128be..a883e9ff380 100644
--- a/boards/arm/imx6/sabre-6quad/configs/citest/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/citest/defconfig
@@ -19,12 +19,11 @@ CONFIG_ARCH_INTERRUPTSTACK=2048
 CONFIG_ARCH_IRQBUTTONS=y
 CONFIG_ARCH_LOWVECTORS=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARMV7A_ASSOCIATIVITY_16WAY=y
-CONFIG_ARMV7A_L2CC_PL310=y
-CONFIG_ARMV7A_WAYSIZE_64KB=y
 CONFIG_BOARD_LOOPSPERMSEC=99369
 CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
+CONFIG_DEBUG_ASSERTIONS=y
+CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_ZERO=y
@@ -48,13 +47,8 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_PL310_LOCKDOWN_BY_LINE=y
-CONFIG_PL310_LOCKDOWN_BY_MASTER=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PSEUDOFS_SOFTLINKS=y
-CONFIG_RAMLOG=y
-CONFIG_RAMLOG_BUFSIZE=16384
-CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAM_SIZE=1073741824
 CONFIG_RAM_START=0x10000000
 CONFIG_RAM_VSTART=0x10000000