diff --git a/platformio/platforms/base.py b/platformio/platforms/base.py
index 0824b4ca..88d5377d 100644
--- a/platformio/platforms/base.py
+++ b/platformio/platforms/base.py
@@ -366,8 +366,7 @@ class BasePlatform(object):
                     self.PACKAGES[pkg_name]['default'] = True
 
         # enable upload tools for upload targets
-        if (set(["upload", "uploadlazy", "uploadeep", "program"])
-                & set(targets)):
+        if any(["upload" in t for t in targets] + ["program" in targets]):
             for _name, _opts in self.PACKAGES.iteritems():
                 if _opts.get("alias") == "uploader":
                     self.PACKAGES[_name]['default'] = True