diff --git a/src/test/java/org/olat/ims/qti/qpool/QTIImportProcessorTest.java b/src/test/java/org/olat/ims/qti/qpool/QTIImportProcessorTest.java
index e5b96344d802fff4c6b0b90361f94af57aaf4e5b..d4339eae3212946dc8483e3d5a62aff6652f2ed4 100644
--- a/src/test/java/org/olat/ims/qti/qpool/QTIImportProcessorTest.java
+++ b/src/test/java/org/olat/ims/qti/qpool/QTIImportProcessorTest.java
@@ -37,6 +37,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.olat.core.commons.persistence.DB;
 import org.olat.core.id.Identity;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.vfs.VFSContainer;
 import org.olat.core.util.vfs.VFSItem;
 import org.olat.core.util.vfs.VFSLeaf;
@@ -47,6 +48,7 @@ import org.olat.ims.qti.qpool.QTIImportProcessor.ItemInfos;
 import org.olat.ims.resources.IMSEntityResolver;
 import org.olat.modules.qpool.QuestionItem;
 import org.olat.modules.qpool.QuestionItemFull;
+import org.olat.modules.qpool.QuestionPoolModule;
 import org.olat.modules.qpool.QuestionStatus;
 import org.olat.modules.qpool.QuestionType;
 import org.olat.modules.qpool.manager.QPoolFileStorage;
@@ -54,6 +56,8 @@ import org.olat.modules.qpool.manager.QuestionItemDAO;
 import org.olat.modules.qpool.model.QEducationalContext;
 import org.olat.modules.qpool.model.QItemType;
 import org.olat.modules.qpool.model.QuestionItemImpl;
+import org.olat.modules.taxonomy.Taxonomy;
+import org.olat.modules.taxonomy.manager.TaxonomyDAO;
 import org.olat.test.JunitTestHelper;
 import org.olat.test.OlatTestCase;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,15 +75,31 @@ public class QTIImportProcessorTest extends OlatTestCase {
 	@Autowired
 	private DB dbInstance;
 	@Autowired
+	private TaxonomyDAO taxonomyDao;
+	@Autowired
 	private QPoolFileStorage qpoolFileStorage;
 	@Autowired
 	private QuestionItemDAO questionItemDao;
+	@Autowired
+	private QuestionPoolModule qPoolModule;
 	
 	@Before
 	public void setup() {
 		if(owner == null) {
 			owner = JunitTestHelper.createAndPersistIdentityAsUser("QTI-imp-owner-" + UUID.randomUUID().toString());
 		}
+
+		Taxonomy taxonomy = null;
+		String taxonomyTreeKey = qPoolModule.getTaxonomyQPoolKey();
+		if(StringHelper.isLong(taxonomyTreeKey)) {
+			taxonomy = taxonomyDao.loadByKey(new Long(taxonomyTreeKey));
+		}
+		
+		if(taxonomy == null) {
+			taxonomy = taxonomyDao.createTaxonomy("DP-1", "Doc-pool", "Taxonomy for document pool", null);
+			dbInstance.commitAndCloseSession();
+			qPoolModule.setTaxonomyQPoolKey(taxonomy.getKey().toString());
+		}
 	}
 	
 	/**
diff --git a/src/test/java/org/olat/modules/docpool/manager/DocumentPoolManagerTest.java b/src/test/java/org/olat/modules/docpool/manager/DocumentPoolManagerTest.java
index be3f9fb2508ae9425648c33ebdb85bfa848e2858..349cb63cab4e1ca03ce201592ec06777d27b1ba4 100644
--- a/src/test/java/org/olat/modules/docpool/manager/DocumentPoolManagerTest.java
+++ b/src/test/java/org/olat/modules/docpool/manager/DocumentPoolManagerTest.java
@@ -66,10 +66,15 @@ public class DocumentPoolManagerTest extends OlatTestCase {
 	private TaxonomyCompetenceDAO taxonomyCompetenceDao;
 	
 	@Before
-	public void setUpDocumentPool() {
+	public void setupTaxonomy() {
+		Taxonomy taxonomy = null;
 		String taxonomyTreeKey = documentPoolModule.getTaxonomyTreeKey();
-		if(!StringHelper.isLong(taxonomyTreeKey)) {
-			Taxonomy taxonomy = taxonomyDao.createTaxonomy("DP-1", "Doc-pool", "Taxonomy for document pool", null);
+		if(StringHelper.isLong(taxonomyTreeKey)) {
+			taxonomy = taxonomyDao.loadByKey(new Long(taxonomyTreeKey));
+		}
+		
+		if(taxonomy == null) {
+			taxonomy = taxonomyDao.createTaxonomy("DP-1", "Doc-pool", "Taxonomy for document pool", null);
 			dbInstance.commitAndCloseSession();
 			documentPoolModule.setTaxonomyTreeKey(taxonomy.getKey().toString());
 		}