diff --git a/tests/WebSharper.CSharp.Tests/Remoting.cs b/tests/WebSharper.CSharp.Tests/Remoting.cs
index bd490a8db..61faa62f6 100644
--- a/tests/WebSharper.CSharp.Tests/Remoting.cs
+++ b/tests/WebSharper.CSharp.Tests/Remoting.cs
@@ -115,18 +115,7 @@ public static int Zero()
 
         static Server()
         {
-            // test IsClient
-            if (WebSharper.Pervasives.IsClient)
-            {
-                throw (new Exception("This should not happen: IsClient is true on the server"));
-            }
-            else
-            {
-                if (!WebSharper.Pervasives.IsClient)
-                {
-                    WebSharper.Core.Remoting.AddHandler(typeof(Handler), new HandlerImpl());
-                }
-            }
+            WebSharper.Core.Remoting.AddHandler(typeof(Handler), new HandlerImpl());
         }
     }