diff --git a/pkg/server/configurationwatcher_test.go b/pkg/server/configurationwatcher_test.go
index 9cd586614..36125db64 100644
--- a/pkg/server/configurationwatcher_test.go
+++ b/pkg/server/configurationwatcher_test.go
@@ -23,7 +23,7 @@ type mockProvider struct {
 	throttleDuration time.Duration
 }
 
-func (p *mockProvider) Provide(configurationChan chan<- dynamic.Message, pool *safe.Pool) error {
+func (p *mockProvider) Provide(configurationChan chan<- dynamic.Message, _ *safe.Pool) error {
 	wait := p.wait
 	if wait == 0 {
 		wait = 20 * time.Millisecond
@@ -48,7 +48,7 @@ func (p *mockProvider) Provide(configurationChan chan<- dynamic.Message, pool *s
 }
 
 // ThrottleDuration returns the throttle duration.
-func (p mockProvider) ThrottleDuration() time.Duration {
+func (p *mockProvider) ThrottleDuration() time.Duration {
 	return p.throttleDuration
 }
 
@@ -123,7 +123,7 @@ func TestWaitForRequiredProvider(t *testing.T) {
 
 	config := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo")),
+			th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar")),
 		),
 	}
@@ -167,19 +167,19 @@ func TestIgnoreTransientConfiguration(t *testing.T) {
 
 	config := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo")),
+			th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar")),
 		),
 	}
 
 	config2 := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("baz")),
+			th.WithRouters(th.WithRouter("baz", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("toto")),
 		),
 	}
 
-	watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{"defaultEP"}, "")
+	watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{}, "")
 
 	publishedConfigCount := 0
 	var lastConfig dynamic.Configuration
@@ -210,17 +210,20 @@ func TestIgnoreTransientConfiguration(t *testing.T) {
 		Configuration: config,
 	}
 
-	close(blockConfConsumer)
-
-	// give some time so that the configuration can be processed
+	// give some time before closing the channel.
 	time.Sleep(20 * time.Millisecond)
 
-	// after 20 milliseconds we should have 1 configs published
+	close(blockConfConsumer)
+
+	// give some time so that the configuration can be processed.
+	time.Sleep(20 * time.Millisecond)
+
+	// after 20 milliseconds we should have 1 config published.
 	assert.Equal(t, 1, publishedConfigCount, "times configs were published")
 
 	expected := dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP"))),
+			th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar@mock")),
 			th.WithMiddlewares(),
 		),
@@ -258,7 +261,7 @@ func TestListenProvidersThrottleProviderConfigReload(t *testing.T) {
 			ProviderName: "mock",
 			Configuration: &dynamic.Configuration{
 				HTTP: th.BuildConfiguration(
-					th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i))),
+					th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i), th.WithEntryPoints("ep"))),
 					th.WithLoadBalancerServices(th.WithService("bar")),
 				),
 			},
@@ -318,7 +321,7 @@ func TestListenProvidersSkipsSameConfigurationForProvider(t *testing.T) {
 		ProviderName: "mock",
 		Configuration: &dynamic.Configuration{
 			HTTP: th.BuildConfiguration(
-				th.WithRouters(th.WithRouter("foo")),
+				th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 				th.WithLoadBalancerServices(th.WithService("bar")),
 			),
 		},
@@ -350,14 +353,14 @@ func TestListenProvidersDoesNotSkipFlappingConfiguration(t *testing.T) {
 
 	configuration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo")),
+			th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar")),
 		),
 	}
 
 	transientConfiguration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("bad")),
+			th.WithRouters(th.WithRouter("bad", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bad")),
 		),
 	}
@@ -372,7 +375,7 @@ func TestListenProvidersDoesNotSkipFlappingConfiguration(t *testing.T) {
 		},
 	}
 
-	watcher := NewConfigurationWatcher(routinesPool, pvd, []string{"defaultEP"}, "")
+	watcher := NewConfigurationWatcher(routinesPool, pvd, []string{}, "")
 
 	var lastConfig dynamic.Configuration
 	watcher.AddListener(func(conf dynamic.Configuration) {
@@ -389,7 +392,7 @@ func TestListenProvidersDoesNotSkipFlappingConfiguration(t *testing.T) {
 
 	expected := dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP"))),
+			th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar@mock")),
 			th.WithMiddlewares(),
 		),
@@ -419,14 +422,14 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
 
 	configuration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo")),
+			th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar")),
 		),
 	}
 
 	transientConfiguration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("bad")),
+			th.WithRouters(th.WithRouter("bad", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bad")),
 		),
 	}
@@ -452,7 +455,7 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
 	err := providerAggregator.AddProvider(pvd)
 	assert.NoError(t, err)
 
-	watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{"defaultEP"}, "")
+	watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{}, "")
 
 	var configurationReloads int
 	var lastConfig dynamic.Configuration
@@ -479,7 +482,7 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
 
 	expected := dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP"))),
+			th.WithRouters(th.WithRouter("foo@mock", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar@mock")),
 			th.WithMiddlewares(),
 		),
@@ -509,7 +512,7 @@ func TestListenProvidersIgnoreSameConfig(t *testing.T) {
 func TestApplyConfigUnderStress(t *testing.T) {
 	routinesPool := safe.NewPool(context.Background())
 
-	watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{"defaultEP"}, "")
+	watcher := NewConfigurationWatcher(routinesPool, &mockProvider{}, []string{}, "")
 
 	routinesPool.GoCtx(func(ctx context.Context) {
 		i := 0
@@ -519,7 +522,7 @@ func TestApplyConfigUnderStress(t *testing.T) {
 				return
 			case watcher.allProvidersConfigs <- dynamic.Message{ProviderName: "mock", Configuration: &dynamic.Configuration{
 				HTTP: th.BuildConfiguration(
-					th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i))),
+					th.WithRouters(th.WithRouter("foo"+strconv.Itoa(i), th.WithEntryPoints("ep"))),
 					th.WithLoadBalancerServices(th.WithService("bar")),
 				),
 			}}:
@@ -554,28 +557,28 @@ func TestListenProvidersIgnoreIntermediateConfigs(t *testing.T) {
 
 	configuration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo")),
+			th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar")),
 		),
 	}
 
 	transientConfiguration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("bad")),
+			th.WithRouters(th.WithRouter("bad", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bad")),
 		),
 	}
 
 	transientConfiguration2 := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("bad2")),
+			th.WithRouters(th.WithRouter("bad2", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bad2")),
 		),
 	}
 
 	finalConfiguration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("final")),
+			th.WithRouters(th.WithRouter("final", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("final")),
 		),
 	}
@@ -595,7 +598,7 @@ func TestListenProvidersIgnoreIntermediateConfigs(t *testing.T) {
 	err := providerAggregator.AddProvider(pvd)
 	assert.NoError(t, err)
 
-	watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{"defaultEP"}, "")
+	watcher := NewConfigurationWatcher(routinesPool, providerAggregator, []string{}, "")
 
 	var configurationReloads int
 	var lastConfig dynamic.Configuration
@@ -614,7 +617,7 @@ func TestListenProvidersIgnoreIntermediateConfigs(t *testing.T) {
 
 	expected := dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("final@mock", th.WithEntryPoints("defaultEP"))),
+			th.WithRouters(th.WithRouter("final@mock", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("final@mock")),
 			th.WithMiddlewares(),
 		),
@@ -646,7 +649,7 @@ func TestListenProvidersPublishesConfigForEachProvider(t *testing.T) {
 
 	configuration := &dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
-			th.WithRouters(th.WithRouter("foo")),
+			th.WithRouters(th.WithRouter("foo", th.WithEntryPoints("ep"))),
 			th.WithLoadBalancerServices(th.WithService("bar")),
 		),
 	}
@@ -658,7 +661,7 @@ func TestListenProvidersPublishesConfigForEachProvider(t *testing.T) {
 		},
 	}
 
-	watcher := NewConfigurationWatcher(routinesPool, pvd, []string{"defaultEP"}, "")
+	watcher := NewConfigurationWatcher(routinesPool, pvd, []string{}, "")
 
 	var publishedProviderConfig dynamic.Configuration
 
@@ -677,8 +680,8 @@ func TestListenProvidersPublishesConfigForEachProvider(t *testing.T) {
 	expected := dynamic.Configuration{
 		HTTP: th.BuildConfiguration(
 			th.WithRouters(
-				th.WithRouter("foo@mock", th.WithEntryPoints("defaultEP")),
-				th.WithRouter("foo@mock2", th.WithEntryPoints("defaultEP")),
+				th.WithRouter("foo@mock", th.WithEntryPoints("ep")),
+				th.WithRouter("foo@mock2", th.WithEntryPoints("ep")),
 			),
 			th.WithLoadBalancerServices(
 				th.WithService("bar@mock"),