diff --git a/pkg/enqueue-bundle/DependencyInjection/Configuration.php b/pkg/enqueue-bundle/DependencyInjection/Configuration.php
index 7fe7b13db..c02b0c508 100644
--- a/pkg/enqueue-bundle/DependencyInjection/Configuration.php
+++ b/pkg/enqueue-bundle/DependencyInjection/Configuration.php
@@ -44,7 +44,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('traceable_producer')->defaultFalse()->end()
                 ->scalarNode('prefix')->defaultValue('enqueue')->end()
                 ->scalarNode('app_name')->defaultValue('app')->end()
-                ->scalarNode('router_topic')->defaultValue('router')->cannotBeEmpty()->end()
+                ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_processor')->defaultValue('enqueue.client.router_processor')->end()
                 ->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
diff --git a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php
index a5e99b40a..bd3162a43 100644
--- a/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php
+++ b/pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -145,7 +145,7 @@ public function testShouldSetDefaultConfigurationForClient()
                 'prefix' => 'enqueue',
                 'app_name' => 'app',
                 'router_processor' => 'enqueue.client.router_processor',
-                'router_topic' => 'router',
+                'router_topic' => 'default',
                 'router_queue' => 'default',
                 'default_processor_queue' => 'default',
                 'traceable_producer' => false,
diff --git a/pkg/simple-client/SimpleClientContainerExtension.php b/pkg/simple-client/SimpleClientContainerExtension.php
index 7fea6f03b..f10a7b186 100644
--- a/pkg/simple-client/SimpleClientContainerExtension.php
+++ b/pkg/simple-client/SimpleClientContainerExtension.php
@@ -172,7 +172,7 @@ private function createConfiguration()
             ->arrayNode('client')->children()
                 ->scalarNode('prefix')->defaultValue('enqueue')->end()
                 ->scalarNode('app_name')->defaultValue('app')->end()
-                ->scalarNode('router_topic')->defaultValue('router')->cannotBeEmpty()->end()
+                ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('router_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->scalarNode('default_processor_queue')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()
                 ->integerNode('redelivered_delay_time')->min(0)->defaultValue(0)->end()
diff --git a/pkg/test/RetryTrait.php b/pkg/test/RetryTrait.php
index 27ef3f5e5..cc8c377e4 100644
--- a/pkg/test/RetryTrait.php
+++ b/pkg/test/RetryTrait.php
@@ -14,6 +14,12 @@ public function runBare()
                 parent::runBare();
 
                 return;
+            } catch (\PHPUnit_Framework_IncompleteTestError $e) {
+                throw $e;
+            } catch (\PHPUnit_Framework_SkippedTestError $e) {
+                throw $e;
+            } catch (\Throwable $e) {
+                // last one thrown below
             } catch (\Exception $e) {
                 // last one thrown below
             }