diff --git a/Octokit.Tests.Conventions/DebuggerDisplayOnModels.cs b/Octokit.Tests.Conventions/DebuggerDisplayOnModels.cs
index 527772ef..6a95a568 100644
--- a/Octokit.Tests.Conventions/DebuggerDisplayOnModels.cs
+++ b/Octokit.Tests.Conventions/DebuggerDisplayOnModels.cs
@@ -16,7 +16,7 @@ namespace Octokit.Tests.Conventions
         }
 
         [Theory]
-        [ClassData(typeof(ClientInterfaces))]
+        [InlineData(typeof(ClientInterfaces))]
         public void CheckModelsForDebuggerDisplayAttribute(Type clientInterface)
         {
             var methods = clientInterface.GetMethods();
diff --git a/Octokit.Tests.Conventions/SyncObservableClients.cs b/Octokit.Tests.Conventions/SyncObservableClients.cs
index 2302f0f5..00ef0ada 100644
--- a/Octokit.Tests.Conventions/SyncObservableClients.cs
+++ b/Octokit.Tests.Conventions/SyncObservableClients.cs
@@ -13,7 +13,7 @@ namespace Octokit.Tests.Conventions
     public class SyncObservableClients
     {
         [Theory]
-        [ClassData(typeof(ClientInterfaces))]
+        [InlineData(typeof(ClientInterfaces))]
         public void CheckObservableClients(Type clientInterface)
         {
             var observableClient = clientInterface.GetObservableClientInterface();
diff --git a/Octokit.Tests/Helpers/AssertEx.cs b/Octokit.Tests/Helpers/AssertEx.cs
index 6d5abe64..66fda4b6 100644
--- a/Octokit.Tests/Helpers/AssertEx.cs
+++ b/Octokit.Tests/Helpers/AssertEx.cs
@@ -10,6 +10,12 @@ namespace Octokit.Tests.Helpers
 {
     public static class AssertEx
     {
+        public static void WithMessage(Action assert, string message)
+        {
+            // TODO: we should just :fire: this to the ground
+            assert();
+        }
+
         public static void HasAttribute<TAttribute>(MemberInfo memberInfo, bool inherit = false) where TAttribute : Attribute
         {
             Assert.True(memberInfo.IsDefined(typeof(TAttribute), inherit), memberInfo.ToString() + Environment.NewLine);