diff --git a/tests/ci/rally-gate.sh b/tests/ci/rally-gate.sh
index 767f98a6..295ecc46 100755
--- a/tests/ci/rally-gate.sh
+++ b/tests/ci/rally-gate.sh
@@ -19,7 +19,7 @@ SCENARIO=$BASE/new/$PROJECT/rally-scenarios/${RALLY_SCENARIO}.yaml
 PLUGINS_DIR=$BASE/new/$PROJECT/rally-scenarios/plugins
 EXTRA_DIR=$BASE/new/$PROJECT/rally-scenarios/extra
 
-RALLY_PLUGINS_DIR=~/.rally/plugins/scenarios/
+RALLY_PLUGINS_DIR=~/.rally/plugins
 
 mkdir -p $RALLY_PLUGINS_DIR
 if [ -d $PLUGINS_DIR ]; then
diff --git a/tests/unit/doc/test_task_samples.py b/tests/unit/doc/test_task_samples.py
index 62eb1d5c..31bb6cdc 100644
--- a/tests/unit/doc/test_task_samples.py
+++ b/tests/unit/doc/test_task_samples.py
@@ -62,7 +62,11 @@ class TaskSampleTestCase(test.TestCase):
         # TODO(boris-42): We should refactor scenarios framework add "_" to
         #                 all non-benchmark methods.. Then this test will pass.
         missing = set(base.Scenario.list_benchmark_scenarios()) - scenarios
-        self.assertEqual(missing, set([]),
+        # check missing scenario is not from plugin
+        missing = [scenario for scenario in list(missing) if
+                   base.Scenario.get_by_name(scenario.split(".")[0]).
+                   __module__.startswith("rally")]
+        self.assertEqual(missing, [],
                          "These scenarios don't have samples: %s" % missing)
 
     def test_json_correct_syntax(self):