diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index 3dfda62b..0e253ce7 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -285,10 +285,12 @@ def ProcessTest(env):
         join("$BUILD_DIR", "UnityTestLib"), get_core_package_dir("tool-unity"))
     env.Prepend(LIBS=[unitylib])
 
-    src_filter = None
+    src_filter = [
+        "+<*.cpp>",
+        "+<*.c>"
+    ]
     if "PIOTEST" in env:
-        src_filter = "+<output_export.cpp>"
-        src_filter += " +<%s%s>" % (env['PIOTEST'], sep)
+        src_filter.append("+<%s%s>" % (env['PIOTEST'], sep))
 
     return env.CollectBuildFiles(
         "$BUILDTEST_DIR",