diff --git a/Frameworks/MQTTnet.UniversalWindows/ServiceCollectionExtensions.cs b/Frameworks/MQTTnet.UniversalWindows/ServiceCollectionExtensions.cs
index 9b8e6f7b..362df4dd 100644
--- a/Frameworks/MQTTnet.UniversalWindows/ServiceCollectionExtensions.cs
+++ b/Frameworks/MQTTnet.UniversalWindows/ServiceCollectionExtensions.cs
@@ -14,20 +14,27 @@ namespace MQTTnet
     public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddMqttServer(this IServiceCollection services)
+        {
+            services.AddMqttServerServices();
+
+            services.AddSingleton<IMqttServer>(s => s.GetService<MqttServer>());
+            services.AddSingleton<MqttServer>();
+
+            return services;
+        }
+
+        public static IServiceCollection AddMqttServerServices(this IServiceCollection services)
         {
             services.AddOptions();
             services.AddSingleton<MqttFactory>();
-            services.AddSingleton<IMqttCommunicationAdapterFactory, MqttFactory>();
-            services.AddSingleton<IMqttClientSesssionFactory, MqttFactory>();
-
-
-            services.AddSingleton<IMqttServer,MqttServer>();
-            services.AddSingleton<MqttServer>();
+            services.AddSingleton<IMqttCommunicationAdapterFactory>(s => s.GetService<MqttFactory>());
+            services.AddSingleton<IMqttClientSesssionFactory>(s => s.GetService<MqttFactory>());
 
             services.AddTransient<IMqttServerAdapter, MqttServerAdapter>();
             services.AddTransient<IMqttPacketSerializer, MqttPacketSerializer>();
 
             services.AddTransient<MqttClientSessionsManager>();
+            services.AddTransient<MqttClientSubscriptionsManager>();
             services.AddTransient<MqttClientRetainedMessagesManager>();
             return services;
         }
@@ -42,7 +49,7 @@ namespace MQTTnet
         public static IServiceCollection AddMqttClient(this IServiceCollection services)
         {
             services.AddSingleton<MqttFactory>();
-            services.AddSingleton<IMqttCommunicationAdapterFactory, MqttFactory>();
+            services.AddSingleton<IMqttCommunicationAdapterFactory>(s => s.GetService<MqttFactory>());
 
             services.AddTransient<IMqttClient, MqttClient>();
             services.AddTransient<MqttClient>();
diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml
index fac1a6c5..f0031b8b 100644
--- a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml
+++ b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml
@@ -84,9 +84,14 @@
                 </StackPanel>
             </PivotItem>
             <PivotItem Header="Server">
-                <StackPanel Orientation="Horizontal">
-                    <Button Width="120" Margin="0,0,10,0" Click="StartServer">Start</Button>
-                    <Button Width="120" Margin="0,0,10,0" Click="StopServer">Stop</Button>
+                <StackPanel Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                    <TextBlock>Port:</TextBlock>
+                    <TextBox x:Name="ServerPort" Text="1883"></TextBox>
+
+                    <StackPanel Orientation="Horizontal">
+                        <Button Width="120" Margin="0,0,10,0" Click="StartServer">Start</Button>
+                        <Button Width="120" Margin="0,0,10,0" Click="StopServer">Stop</Button>
+                    </StackPanel>
                 </StackPanel>
             </PivotItem>
         </Pivot>
diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs
index 32ff9f94..76c0d073 100644
--- a/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs
+++ b/Tests/MQTTnet.TestApp.UniversalWindows/MainPage.xaml.cs
@@ -329,7 +329,11 @@ namespace MQTTnet.TestApp.UniversalWindows
                 return;
             }
 
-            _mqttServer = new MqttFactory().CreateMqttServer();
+            _mqttServer = new MqttFactory().CreateMqttServer(o =>
+            {
+                o.DefaultEndpointOptions.Port = int.Parse(ServerPort.Text);
+            });
+
             await _mqttServer.StartAsync();
         }