diff --git a/test-app/app_pic32ck.c b/test-app/app_pic32ck.c
index cdc9bc0f..af94c26b 100644
--- a/test-app/app_pic32ck.c
+++ b/test-app/app_pic32ck.c
@@ -46,16 +46,19 @@
 #define PORTD_OUTCLR (*(volatile uint32_t *)(PORTD_BASE + 0x14))
 #define PORTD_OUTCLR_OUT(X) (1 << (X))
 
+#define LED0_PIN (20)
+#define LED1_PIN (25)
+
 static void led0_on(void)
 {
-    PORTD_DIRSET = PORTD_DIRSET_OUT(20);
-    PORTD_OUTCLR = PORTD_OUTCLR_OUT(20);
+    PORTD_DIRSET = PORTD_DIRSET_OUT(LED0_PIN);
+    PORTD_OUTCLR = PORTD_OUTCLR_OUT(LED0_PIN);
 }
 
 static void led1_on(void)
 {
-    PORTB_DIRSET = PORTB_DIRSET_OUT(25);
-    PORTB_OUTCLR = PORTB_OUTCLR_OUT(25);
+    PORTB_DIRSET = PORTB_DIRSET_OUT(LED1_PIN);
+    PORTB_OUTCLR = PORTB_OUTCLR_OUT(LED1_PIN);
 }
 
 void main(void)
diff --git a/test-app/app_pic32cz.c b/test-app/app_pic32cz.c
index 9ad8c5d1..8341bf5b 100644
--- a/test-app/app_pic32cz.c
+++ b/test-app/app_pic32cz.c
@@ -38,16 +38,19 @@
 #define PORTB_OUTCLR (*(volatile uint32_t *)(PORTB_BASE + 0x14))
 #define PORTB_OUTCLR_OUT(X) (1 << (X))
 
+#define LED0_PIN 21
+#define LED1_PIN 22
+
 static void led0_on(void)
 {
-    PORTB_DIRSET = PORTB_DIRSET_OUT(21);
-    PORTB_OUTCLR = PORTB_OUTCLR_OUT(21);
+    PORTB_DIRSET = PORTB_DIRSET_OUT(LED0_PIN);
+    PORTB_OUTCLR = PORTB_OUTCLR_OUT(LED0_PIN);
 }
 
 static void led1_on(void)
 {
-    PORTB_DIRSET = PORTB_DIRSET_OUT(22);
-    PORTB_OUTCLR = PORTB_OUTCLR_OUT(22);
+    PORTB_DIRSET = PORTB_DIRSET_OUT(LED1_PIN);
+    PORTB_OUTCLR = PORTB_OUTCLR_OUT(LED1_PIN);
 }
 
 void main(void)