diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj
new file mode 100644
index 00000000..e0f096f5
--- /dev/null
+++ b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj
@@ -0,0 +1,79 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {5345E2E6-4E7C-40F8-831B-E491F6051D3C}
+ Library
+ Properties
+ Octokit.Tests.Conventions
+ Octokit.Tests.Conventions
+ v4.5
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+
+
+
+ False
+ ..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll
+
+
+ False
+ ..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll
+
+
+ ..\packages\xunit.1.9.2\lib\net20\xunit.dll
+
+
+ ..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll
+
+
+
+
+
+
+
+
+
+
+
+ {674b69b8-0780-4d54-ae2b-c15821fa51cb}
+ Octokit.Reactive
+
+
+ {08dd4305-7787-4823-a53f-4d0f725a07f3}
+ Octokit
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Octokit.Tests.Conventions/Properties/AssemblyInfo.cs b/Octokit.Tests.Conventions/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..da2071ab
--- /dev/null
+++ b/Octokit.Tests.Conventions/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Octokit.Tests.Conventions")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Octokit.Tests.Conventions")]
+[assembly: AssemblyCopyright("Copyright © 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("12127138-325b-4d55-a4f9-a3f915582e6f")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Octokit.Tests/Reactive/SyncObservableClients.cs b/Octokit.Tests.Conventions/SyncObservableClients.cs
similarity index 98%
rename from Octokit.Tests/Reactive/SyncObservableClients.cs
rename to Octokit.Tests.Conventions/SyncObservableClients.cs
index 726ff0da..d29cdf86 100644
--- a/Octokit.Tests/Reactive/SyncObservableClients.cs
+++ b/Octokit.Tests.Conventions/SyncObservableClients.cs
@@ -8,9 +8,8 @@ using Octokit.Reactive;
using Xunit;
using Xunit.Extensions;
-namespace Octokit.Tests.Reactive
+namespace Octokit.Tests.Conventions
{
- [Trait("Category", "CheckClients")]
public class SyncObservableClients
{
public static IEnumerable