diff --git a/HISTORY.rst b/HISTORY.rst
index 82981189..a34feec2 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -23,6 +23,7 @@ PlatformIO 2.0
   (`issue #465 <https://github.com/platformio/platformio/issues/465>`_)
 * Set 1Mb SPIFFS for Espressif boards by default
   (`issue #458 <https://github.com/platformio/platformio/issues/458>`_)
+* Exclude ``test*`` folder by default from build process
 * Fixed builder for mbed framework and ST STM32 platform
 
 
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index b7a9fbf6..ee83a1fe 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -27,7 +27,8 @@ from platformio.util import pioversion_to_intstr
 SRC_BUILD_EXT = ["c", "cpp", "S", "spp", "SPP", "sx", "s", "asm", "ASM"]
 SRC_HEADER_EXT = ["h", "hpp"]
 SRC_DEFAULT_FILTER = " ".join([
-    "+<*>", "-<.git%s>" % sep, "-<svn%s>" % sep, "-<example*%s>" % sep
+    "+<*>", "-<.git%s>" % sep, "-<svn%s>" % sep, "-<example*%s>" % sep,
+    "-<test*%s>" % sep
 ])