diff --git a/astlpc.c b/astlpc.c
index d32211e..fe4b84f 100644
--- a/astlpc.c
+++ b/astlpc.c
@@ -119,11 +119,6 @@
 
 #define LPC_WIN_SIZE                (1 * 1024 * 1024)
 
-enum {
-	KCS_REG_DATA = 0,
-	KCS_REG_STATUS = 1,
-};
-
 #define KCS_STATUS_BMC_READY		0x80
 #define KCS_STATUS_CHANNEL_ACTIVE	0x40
 #define KCS_STATUS_IBF			0x02
diff --git a/tests/test_astlpc.c b/tests/test_astlpc.c
index faea13c..11e5699 100644
--- a/tests/test_astlpc.c
+++ b/tests/test_astlpc.c
@@ -199,7 +199,7 @@
 	/* BMC initialisation */
 	endpoint_init(&ctx->bmc, 8, MCTP_BINDING_ASTLPC_MODE_BMC, &ctx->kcs,
 		      ctx->lpc_mem);
-	assert(ctx->kcs[KCS_REG_STATUS] & KCS_STATUS_BMC_READY);
+	assert(ctx->kcs[MCTP_ASTLPC_KCS_REG_STATUS] & KCS_STATUS_BMC_READY);
 
 	/* Host initialisation */
 	endpoint_init(&ctx->host, 9, MCTP_BINDING_ASTLPC_MODE_HOST, &ctx->kcs,
@@ -207,8 +207,9 @@
 
 	/* BMC processes host channel init request, alerts host */
 	mctp_astlpc_poll(ctx->bmc.astlpc);
-	assert(ctx->kcs[KCS_REG_STATUS] & KCS_STATUS_CHANNEL_ACTIVE);
-	assert(ctx->kcs[KCS_REG_DATA] == 0xff);
+	assert(ctx->kcs[MCTP_ASTLPC_KCS_REG_STATUS] &
+	       KCS_STATUS_CHANNEL_ACTIVE);
+	assert(ctx->kcs[MCTP_ASTLPC_KCS_REG_DATA] == 0xff);
 
 	/* Host dequeues channel init result */
 	mctp_astlpc_poll(ctx->host.astlpc);