diff --git a/wa/framework/configuration/core.py b/wa/framework/configuration/core.py
index 81a14f9d..0c38baf0 100644
--- a/wa/framework/configuration/core.py
+++ b/wa/framework/configuration/core.py
@@ -476,6 +476,10 @@ class MetaConfiguration(Configuration):
     def plugins_directory(self):
         return os.path.join(self.user_directory, 'plugins')
 
+    @property
+    def plugin_paths(self):
+        return [self.plugins_directory] + (self.extra_plugin_paths or [])
+
     @property
     def user_config_file(self):
         return os.path.join(self.user_directory, 'config.yaml')
diff --git a/wa/framework/pluginloader.py b/wa/framework/pluginloader.py
index d03fa932..548f42d9 100644
--- a/wa/framework/pluginloader.py
+++ b/wa/framework/pluginloader.py
@@ -38,7 +38,7 @@ class __LoaderWrapper(object):
         from wa.framework.plugin import PluginLoader
         from wa.framework.configuration.core import settings
         self._loader = PluginLoader(settings.plugin_packages,
-                                    [settings.plugins_directory], [])
+                                    settings.plugin_paths, [])
 
     def update(self, packages=None, paths=None, ignore_paths=None):
         if not self._loader: