diff --git a/Vagrantfile b/Vagrantfile
index 8a8a04ab..3e7ab10b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 $script = <<SCRIPT
-    dnf install -y python python-virtualenv python-devel libffi-devel redhat-rpm-config openssl-devel gcc gcc-c++ koji git swig fedmsg-relay rpm-build
+    dnf install -y python python-virtualenv python-devel libffi-devel redhat-rpm-config openssl-devel gcc gcc-c++ koji git swig fedmsg-relay rpm-build python-mock
     pip install -r /opt/module_build_service/src/requirements.txt
     pip install -r /opt/module_build_service/src/test-requirements.txt
     cd /opt/module_build_service/src
diff --git a/module_build_service/config.py b/module_build_service/config.py
index 3fbb2f1c..646bae1e 100644
--- a/module_build_service/config.py
+++ b/module_build_service/config.py
@@ -269,7 +269,10 @@ class Config(object):
 
     @rpms_default_repository.setter
     def rpms_default_repository(self, s):
-        self._rpms_default_repository = str(s)
+        rpm_repo = str(s)
+        if rpm_repo[-1] != '/':
+            rpm_repo = rpm_repo + '/'
+        self._rpms_default_repository = rpm_repo
 
     @property
     def rpms_allow_repository(self):
@@ -287,7 +290,10 @@ class Config(object):
 
     @rpms_default_cache.setter
     def rpms_default_cache(self, s):
-        self._rpms_default_cache = str(s)
+        rpm_cache = str(s)
+        if rpm_cache[-1] != '/':
+            rpm_cache = rpm_cache + '/'
+        self._rpms_default_cache = rpm_cache
 
     @property
     def rpms_allow_cache(self):