diff --git a/tests/periph_gpio/main.c b/tests/periph_gpio/main.c
index 427b3ec3db366a63007ac93feef99b7d0d169c3d..fde10a49c86d8346a8018d85b6bd37e4112aa107 100644
--- a/tests/periph_gpio/main.c
+++ b/tests/periph_gpio/main.c
@@ -66,7 +66,7 @@ static int init_out(int argc, char **argv)
     else {
         pull = GPIO_NOPULL;
     }
-    if (gpio_init(GPIO(port, pin), GPIO_DIR_OUT, pull) < 0) {
+    if (gpio_init(GPIO_PIN(port, pin), GPIO_DIR_OUT, pull) < 0) {
         printf("Error while initializing  PORT_%i.%i as output\n", port, pin);
         return 1;
     }
@@ -97,7 +97,7 @@ static int init_in(int argc, char **argv)
     else {
         pull = GPIO_NOPULL;
     }
-    if (gpio_init(GPIO(port, pin), GPIO_DIR_IN, pull) < 0) {
+    if (gpio_init(GPIO_PIN(port, pin), GPIO_DIR_IN, pull) < 0) {
         printf("Error while initializing  PORT_%i.%02i as input\n", port, pin);
         return 1;
     }
@@ -146,7 +146,7 @@ static int init_int(int argc, char **argv)
     else {
         pull = GPIO_NOPULL;
     }
-    if (gpio_init_int(GPIO(port, pin), pull, flank, cb, (void *)pin) < 0) {
+    if (gpio_init_int(GPIO_PIN(port, pin), pull, flank, cb, (void *)pin) < 0) {
         printf("Error while initializing  PORT_%i.%02i as external interrupt\n",
                port, pin);
         return 1;
@@ -167,7 +167,7 @@ static int read(int argc, char **argv)
     }
     port = atoi(argv[1]);
     pin = atoi(argv[2]);
-    if (gpio_read(GPIO(port, pin))) {
+    if (gpio_read(GPIO_PIN(port, pin))) {
         printf("PORT_%i.%02i is HIGH\n", port, pin);
     }
     else {
@@ -187,7 +187,7 @@ static int set(int argc, char **argv)
     port = atoi(argv[1]);
     pin = atoi(argv[2]);
 
-    gpio_set(GPIO(port, pin));
+    gpio_set(GPIO_PIN(port, pin));
     return 0;
 }
 
@@ -201,7 +201,7 @@ static int clear(int argc, char **argv)
     }
     port = atoi(argv[1]);
     pin = atoi(argv[2]);
-    gpio_clear(GPIO(port, pin));
+    gpio_clear(GPIO_PIN(port, pin));
     return 0;
 }
 
@@ -215,7 +215,7 @@ static int toggle(int argc, char **argv)
     }
     port = atoi(argv[1]);
     pin = atoi(argv[2]);
-    gpio_toggle(GPIO(port, pin));
+    gpio_toggle(GPIO_PIN(port, pin));
     return 0;
 }
 
diff --git a/tests/periph_spi/main.c b/tests/periph_spi/main.c
index c04a20bdfa9390d7c08aa961a251f082d2947c38..772d6fbddb38f7f1c4c8e4f34fcefaed8dd610e2 100644
--- a/tests/periph_spi/main.c
+++ b/tests/periph_spi/main.c
@@ -87,7 +87,7 @@ int parse_spi_dev(int argc, char **argv)
     }
     port = atoi(argv[2]);
     pin = atoi(argv[3]);
-    spi_cs = GPIO(port,pin);
+    spi_cs = GPIO_PIN(port,pin);
     if (argc >= 5) {
         spi_mode = argv[4][0] - '0';
         if (spi_mode < 0 || spi_mode > 3) {