diff --git a/almanach/tests/tempest/plugin.py b/almanach/tests/tempest/plugin.py
index ac1b919..43b132f 100644
--- a/almanach/tests/tempest/plugin.py
+++ b/almanach/tests/tempest/plugin.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import almanach
 import os
 
 from tempest import config
@@ -24,8 +25,8 @@ class AlmanachTempestPlugin(plugins.TempestPlugin):
 
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
-            os.path.abspath(__file__)))[0]
-        test_dir = "tempest/tests"
+                os.path.abspath(almanach.__file__)))[0]
+        test_dir = "almanach/tests/tempest/tests"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6deb7a0..db83afb 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -43,7 +43,7 @@ function almanach_configure {
     iniset $ALMANACH_CONF keystone_authtoken project_name $SERVICE_PROJECT_NAME
     iniset $ALMANACH_CONF keystone_authtoken auth_url $KEYSTONE_SERVICE_URI_V3
 
-    iniset $ALMANACH_CONF collector transport_url rabbit://stackrabbit:secret@localhost:5672
+    iniset $ALMANACH_CONF collector transport_url rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672
 
     iniset $ALMANACH_CONF database connection_url mongodb://localhost/almanach
 }