diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 12baebe0..a3677e26 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -95,8 +95,6 @@ def BuildProgram(env):
 
     if "__debug" in COMMAND_LINE_TARGETS:
         env.ProcessDebug()
-    if "__test" in COMMAND_LINE_TARGETS:
-        env.ProcessTest()
 
     # process extra flags from board
     if "BOARD" in env and "build.extra_flags" in env.BoardConfig():
@@ -114,6 +112,9 @@ def BuildProgram(env):
     # remove specified flags
     env.ProcessUnFlags(env.get("BUILD_UNFLAGS"))
 
+    if "__test" in COMMAND_LINE_TARGETS:
+        env.ProcessTest()
+
     # build project with dependencies
     _build_project_deps(env)