diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 57857888f4504c5cddadf8ca0b56eaa8a71f295b..8d66a403bb36e4c6791739f69303a04dc142f250 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -66,7 +66,7 @@ import de.thm.arsnova.exceptions.UnauthorizedException;
 import de.thm.arsnova.services.ISessionService;
 import de.thm.arsnova.services.IUserService;
 
-@Component
+@Component("databaseDao")
 public class CouchDBDao implements IDatabaseDao {
 	@Autowired
 	private IUserService userService;
diff --git a/src/test/resources/test-config.xml b/src/test/resources/test-config.xml
index 1b6ae97af84c9bd28970863243c22ecc7e062a7b..eb47eed878fcb0606cfd69a55b34ed5f156994e6 100644
--- a/src/test/resources/test-config.xml
+++ b/src/test/resources/test-config.xml
@@ -5,6 +5,10 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
+	<bean id="servletContext" class="org.springframework.mock.web.MockServletContext">
+		<property name="contextPath" value="/" />
+	</bean>
+
 	<bean id="sessionService" class="de.thm.arsnova.services.SessionService">
 		<property name="databaseDao" ref="databaseDao" />
 	</bean>