diff --git a/.gitignore b/.gitignore
index 25165f8..3a9875b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 /vendor/
 composer.lock
-test/Functional/cache
-test/Functional/logs
diff --git a/composer.json b/composer.json
index 6837f57..cef98b2 100644
--- a/composer.json
+++ b/composer.json
@@ -44,15 +44,12 @@
   "require-dev": {
     "broadway/event-store-dbal": "^0.1",
     "elasticsearch/elasticsearch": "~1.0|^2.0",
-    "symfony/framework-bundle": "^2.3|^3.0",
+    "instaclick/base-test-bundle": "~0.5",
     "monolog/monolog": "~1.8",
-    "symfony/proxy-manager-bridge": "^2.3|^3.0",
+    "symfony/proxy-manager-bridge": "~2.4",
     "phpunit/phpunit": "^4.8",
     "matthiasnoback/symfony-config-test": "^2.0",
-    "matthiasnoback/symfony-dependency-injection-test": "^1.1",
-    "symfony/browser-kit": "^2.3|^3.0",
-    "symfony/property-access": "^2.3|^3.0",
-    "matthiasnoback/symfony-service-definition-validator": "^1.2"
+    "matthiasnoback/symfony-dependency-injection-test": "^1.1"
   },
   "suggest": {
     "psr/log-implementation": "Implementation for PSR3, LoggerInterface"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 5055a20..bfa6a19 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -27,7 +27,4 @@
       <group>mongo</group>
     </exclude>
   </groups>
-  <php>
-    <server name="KERNEL_DIR" value="test/Functional/" />
-  </php>
 </phpunit>
diff --git a/src/BroadwayBundle.php b/src/BroadwayBundle.php
index 10d5764..b086642 100644
--- a/src/BroadwayBundle.php
+++ b/src/BroadwayBundle.php
@@ -19,9 +19,7 @@
 use Broadway\Bundle\BroadwayBundle\DependencyInjection\RegisterMetadataEnricherSubscriberPass;
 use Broadway\Bundle\BroadwayBundle\DependencyInjection\RegisterSagaCompilerPass;
 use Broadway\Bundle\BroadwayBundle\DependencyInjection\RegisterSerializersCompilerPass;
-use Matthias\SymfonyServiceDefinitionValidator\Compiler\ValidateServiceDefinitionsPass;
 use Symfony\Component\Console\Application;
-use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -75,13 +73,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(
             new RegisterSerializersCompilerPass()
         );
-
-        if ($container->getParameter('kernel.debug')) {
-            $container->addCompilerPass(
-                new ValidateServiceDefinitionsPass(),
-                PassConfig::TYPE_AFTER_REMOVING
-            );
-        }
     }
 
     /**
diff --git a/test/BroadwayBundleTest.php b/test/BroadwayBundleTest.php
new file mode 100644
index 0000000..ebca46e
--- /dev/null
+++ b/test/BroadwayBundleTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Broadway\Bundle\BroadwayBundle;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class BroadwayBundleTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function it_builds_the_bundle()
+    {
+        $container = new ContainerBuilder();
+
+        $bundle = new BroadwayBundle();
+        $bundle->build($container);
+
+        $container->compile();
+    }
+}
diff --git a/test/Functional/AppKernel.php b/test/Functional/AppKernel.php
deleted file mode 100644
index e2a0413..0000000
--- a/test/Functional/AppKernel.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of the broadway/broadway package.
- *
- * (c) Qandidate.com <opensource@qandidate.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Broadway\Bundle\BroadwayBundle\BroadwayBundle;
-use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\HttpKernel\Kernel;
-
-class AppKernel extends Kernel
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function registerBundles()
-    {
-        return [
-            new FrameworkBundle(),
-            new DoctrineBundle(),
-            new BroadwayBundle(),
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function registerContainerConfiguration(LoaderInterface $loader)
-    {
-        $loader->load(__DIR__ . '/config_functional.yml');
-    }
-}
diff --git a/test/Functional/BroadwayBundleTest.php b/test/Functional/BroadwayBundleTest.php
deleted file mode 100644
index e62155b..0000000
--- a/test/Functional/BroadwayBundleTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of the broadway/broadway package.
- *
- * (c) Qandidate.com <opensource@qandidate.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Broadway\Bundle\BroadwayBundle\Functional;
-
-use Broadway\Auditing\NullByteCommandSerializer;
-use Broadway\EventDispatcher\EventDispatcher;
-use Broadway\EventStore\Dbal\DBALEventStore;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-
-/**
- * @group functional
- */
-class BroadwayBundleTest extends WebTestCase
-{
-    private $client;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->client = static::createClient();
-    }
-
-    /**
-     * @test
-     */
-    public function it_boots_the_application()
-    {
-    }
-
-    /**
-     * @test regression test
-     */
-    public function it_instantiates_the_auditing_serializer()
-    {
-        $this->assertInstanceOf(
-            NullByteCommandSerializer::class,
-            $this->client->getContainer()->get('broadway.auditing.serializer')
-        );
-    }
-
-    /**
-     * @test regression test
-     */
-    public function it_instantiates_the_event_dispatcher()
-    {
-        $this->assertInstanceOf(
-            EventDispatcher::class,
-            $this->client->getContainer()->get('broadway.event_dispatcher')
-        );
-    }
-
-    /**
-     * @test regression test
-     */
-    public function it_instantiates_the_dbal_event_store()
-    {
-        $this->assertInstanceOf(
-            DBALEventStore::class,
-            $this->client->getContainer()->get('broadway.event_store.dbal')
-        );
-    }
-}
diff --git a/test/Functional/config_functional.yml b/test/Functional/config_functional.yml
deleted file mode 100644
index e69763c..0000000
--- a/test/Functional/config_functional.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-framework:
-  test: ~
-  secret: "CQRS stands for Command Query Responsibility Segregation"
-
-broadway:
-  event_store:
-    dbal:
-      enabled: true
-  command_handling:
-    logger: my_logger
-
-services:
-  my_logger:
-    class: Monolog\Logger
-    arguments:
-      - "my_logger"
-
-doctrine:
-  dbal:
-    driver: pdo_sqlite