diff --git a/tools/sandbox/cli-config.php b/tools/sandbox/cli-config.php
index dc2c9875e..5c69499b0 100644
--- a/tools/sandbox/cli-config.php
+++ b/tools/sandbox/cli-config.php
@@ -10,6 +10,9 @@ $classLoader->register();
 
 $config = new \Doctrine\ORM\Configuration();
 $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache);
+$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__."/Entities"));
+$config->setMetadataDriverImpl($driverImpl);
+
 $config->setProxyDir(__DIR__ . '/Proxies');
 $config->setProxyNamespace('Proxies');
 
diff --git a/tools/sandbox/index.php b/tools/sandbox/index.php
index ab1f78dd4..37879eef4 100644
--- a/tools/sandbox/index.php
+++ b/tools/sandbox/index.php
@@ -30,11 +30,14 @@ $proxiesClassLoader->register();
 $config = new Configuration;
 $cache = new ApcCache;
 $config->setMetadataCacheImpl($cache);
+$driverImpl = $config->newDefaultAnnotationDriver(array(__DIR__."/Entities"));
+$config->setMetadataDriverImpl($driverImpl);
 $config->setQueryCacheImpl($cache);
 
 // Proxy configuration
 $config->setProxyDir(__DIR__ . '/Proxies');
 $config->setProxyNamespace('Proxies');
+$config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache);
 
 // Database connection information
 $connectionOptions = array(