diff --git a/HISTORY.rst b/HISTORY.rst
index ffc9b7f0..421ee665 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.8.2 (2016-01-??)
+~~~~~~~~~~~~~~~~~~
+
+* Exclude only ``test`` and ``tests`` folders from build process
+
 2.8.1 (2016-01-29)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 94a227fb..bfaec0e2 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 8, 1)
+VERSION = (2, 8, "2.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index b1401944..423e31aa 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -28,7 +28,7 @@ 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,
-    "-<test*%s>" % sep
+    "-<test%s>" % sep, "-<tests%s>" % sep
 ])