diff --git a/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs b/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
index ef1d787cf5..3857d33903 100644
--- a/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
+++ b/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
@@ -9,45 +9,48 @@ namespace Perspex.Styling.UnitTests
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using Perspex.Controls;
     using Perspex.Styling;
+    using Xunit;
 
-    ////[TestFixture]
-    ////public class SelectorTests_Multiple
-    ////{
-    ////    [Fact]
-    ////    public void Template_Child_Of_Control_With_Two_Classes()
-    ////    {
-    ////        var template = new ControlTemplate(parent =>
-    ////        {
-    ////            return new Border
-    ////            {
-    ////                Id = "border",
-    ////            };
-    ////        });
-
-    ////        var control = new Button
-    ////        {
-    ////            Template = template,
-    ////        };
-
-    ////        var selector = new Selector()
-    ////            .OfType<Button>()
-    ////            .Class("foo")
-    ////            .Class("bar")
-    ////            .Template()
-    ////            .Id("border");
-
-    ////        var border = (Border)((IVisual)control).VisualChildren.Single();
-    ////        var values = new List<bool>();
-    ////        var activator = selector.GetActivator(border);
-
-    ////        activator.Subscribe(x => values.Add(x));
-
-    ////        Assert.Equal(new[] { false }, values);
-    ////        control.Classes.Add("foo", "bar");
-    ////        Assert.Equal(new[] { false, true }, values);
-    ////        control.Classes.Remove("foo");
-    ////        Assert.Equal(new[] { false, true, false }, values);
-    ////    }
-    ////}
+    public class SelectorTests_Multiple
+    {
+        [Fact]
+        public void Template_Child_Of_Control_With_Two_Classes()
+        {
+            var template = new ControlTemplate(parent =>
+            {
+                return new Border
+                {
+                    Id = "border",
+                };
+            });
+
+            var control = new Button
+            {
+                Template = template,
+            };
+
+            control.ApplyTemplate();
+
+            var selector = new Selector()
+                .OfType<Button>()
+                .Class("foo")
+                .Class("bar")
+                .Template()
+                .Id("border");
+
+            var border = (Border)((IVisual)control).VisualChildren.Single();
+            var values = new List<bool>();
+            var activator = selector.GetActivator(border);
+
+            activator.Subscribe(x => values.Add(x));
+
+            Assert.Equal(new[] { false }, values);
+            control.Classes.Add("foo", "bar");
+            Assert.Equal(new[] { false, true }, values);
+            control.Classes.Remove("foo");
+            Assert.Equal(new[] { false, true, false }, values);
+        }
+    }
 }