diff --git a/bootstrap.php b/bootstrap.php
index 355ca96..cec4a27 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -19,7 +19,11 @@
 $container->init();
 $container->initErrorHandlers();
 
-$container->bootstrapModule('Doctrine');
+$doctrine = $container->bootstrapModule('Doctrine');
+$ecmd = $doctrine->registerEntityClassesMetadataDriver()->getEntityClassesMetadataDriver();
+$ecmd->addClass('Psc\Doctrine\TestEntities\Tag');
+$ecmd->addClass('Psc\Doctrine\TestEntities\Article');
+
 $container->bootstrapModule('PHPExcel');
 $container->bootstrapModuleIfExists('Imagine');
 
diff --git a/tests/Psc/Doctrine/SynchronizerTestCase.php b/tests/Psc/Doctrine/SynchronizerTestCase.php
index 7f3a72a..505e67c 100644
--- a/tests/Psc/Doctrine/SynchronizerTestCase.php
+++ b/tests/Psc/Doctrine/SynchronizerTestCase.php
@@ -25,8 +25,11 @@ public function setUp() {
   }
 
   protected function setUpModule($module) {
+    /*
+    this is done in bootstrap.php
     $this->loadEntity('Psc\Doctrine\TestEntities\Tag', $module);
     $this->loadEntity($this->entityClass, $module);
+    */
   }
 
   // toCollection ist eine Repräsentation der Objekte aus dem Universum ($this->tags) als Tag labels oder als objekt: id,label