diff --git a/meson.build b/meson.build
index fc82c1f6..443d45e1 100644
--- a/meson.build
+++ b/meson.build
@@ -62,7 +62,7 @@ main_src = []
 # Add to sources either the main executable or a platform test
 if get_option('test') != ''
   main_src += 'tests/platform/'+get_option('test')+'.c'
-  def      += {'DISABLE_KEEP_ON' : ''}
+  def      += {'RUNNING_TESTSUITE' : ''}
 else
   main_src += 'openrtx/src/main.c'
 endif
diff --git a/platform/targets/DM-1801/platform.c b/platform/targets/DM-1801/platform.c
index 580fe63b..cd95dcb3 100644
--- a/platform/targets/DM-1801/platform.c
+++ b/platform/targets/DM-1801/platform.c
@@ -44,7 +44,7 @@ void platform_init()
 
     gpio_setMode(PTT_SW, INPUT);
 
-    #ifndef DISABLE_KEEP_ON
+    #ifndef RUNNING_TESTSUITE
     gpio_setMode(PWR_SW, OUTPUT);
     #endif
 
diff --git a/platform/targets/GD-77/platform.c b/platform/targets/GD-77/platform.c
index d7fc6f3d..e694c4aa 100644
--- a/platform/targets/GD-77/platform.c
+++ b/platform/targets/GD-77/platform.c
@@ -43,7 +43,7 @@ void platform_init()
 
     gpio_setMode(PTT_SW, INPUT);
 
-    #ifndef DISABLE_KEEP_ON
+    #ifndef RUNNING_TESTSUITE
     gpio_setMode(PWR_SW, OUTPUT);
     #endif
 
diff --git a/platform/targets/MD-3x0/platform.c b/platform/targets/MD-3x0/platform.c
index 22e294ae..160f93ab 100644
--- a/platform/targets/MD-3x0/platform.c
+++ b/platform/targets/MD-3x0/platform.c
@@ -46,7 +46,7 @@ void platform_init()
     gpio_setMode(PTT_SW,  INPUT_PULL_UP);
     gpio_setMode(PTT_EXT, INPUT_PULL_UP);
 
-    #ifndef DISABLE_KEEP_ON
+    #ifndef RUNNING_TESTSUITE
     gpio_setMode(PWR_SW, OUTPUT);
     gpio_setPin(PWR_SW);
     #endif
diff --git a/platform/targets/MD-UV3x0/platform.c b/platform/targets/MD-UV3x0/platform.c
index 8326a0b6..a83195ce 100644
--- a/platform/targets/MD-UV3x0/platform.c
+++ b/platform/targets/MD-UV3x0/platform.c
@@ -45,7 +45,7 @@ void platform_init()
     gpio_setMode(PTT_SW, INPUT_PULL_UP);
     gpio_setMode(PTT_EXT, INPUT_PULL_UP);
 
-    #ifndef DISABLE_KEEP_ON
+    #ifndef RUNNING_TESTSUITE
     gpio_setMode(PWR_SW, OUTPUT);
     gpio_setPin(PWR_SW);
     #endif