diff --git a/Octokit.Reactive/Clients/ObservableReferencesClient.cs b/Octokit.Reactive/Clients/ObservableReferencesClient.cs
index 8ebb1373..4f578098 100644
--- a/Octokit.Reactive/Clients/ObservableReferencesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableReferencesClient.cs
@@ -1,7 +1,6 @@
using System;
using System.Reactive;
using System.Reactive.Threading.Tasks;
-
using Octokit.Reactive.Internal;
namespace Octokit.Reactive
diff --git a/Octokit.Tests/Clients/CommitsClientTests.cs b/Octokit.Tests/Clients/CommitsClientTests.cs
index 981c1c7c..1901322a 100644
--- a/Octokit.Tests/Clients/CommitsClientTests.cs
+++ b/Octokit.Tests/Clients/CommitsClientTests.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using NSubstitute;
+using Octokit;
using Octokit.Tests.Helpers;
using Xunit;
diff --git a/Octokit.Tests/Clients/GistsClientTests.cs b/Octokit.Tests/Clients/GistsClientTests.cs
index 30c2f53a..f83742cf 100644
--- a/Octokit.Tests/Clients/GistsClientTests.cs
+++ b/Octokit.Tests/Clients/GistsClientTests.cs
@@ -1,5 +1,6 @@
using System;
using NSubstitute;
+using Octokit;
using Xunit;
public class GistsClientTests
diff --git a/Octokit.Tests/Clients/GitDatabaseClientTests.cs b/Octokit.Tests/Clients/GitDatabaseClientTests.cs
index dfad5e3f..7c417981 100644
--- a/Octokit.Tests/Clients/GitDatabaseClientTests.cs
+++ b/Octokit.Tests/Clients/GitDatabaseClientTests.cs
@@ -1,5 +1,6 @@
using System;
using NSubstitute;
+using Octokit;
using Xunit;
public class GitDatabaseClientTests
diff --git a/Octokit.Tests/Clients/IssueCommentsClientTests.cs b/Octokit.Tests/Clients/IssueCommentsClientTests.cs
index a336f6a0..1bac6036 100644
--- a/Octokit.Tests/Clients/IssueCommentsClientTests.cs
+++ b/Octokit.Tests/Clients/IssueCommentsClientTests.cs
@@ -1,6 +1,7 @@
using System;
using System.Threading.Tasks;
using NSubstitute;
+using Octokit;
using Octokit.Internal;
using Octokit.Tests.Helpers;
using Xunit;
diff --git a/Octokit.Tests/Clients/ReferencesClientTests.cs b/Octokit.Tests/Clients/ReferencesClientTests.cs
index cf7e7de0..5ca39024 100644
--- a/Octokit.Tests/Clients/ReferencesClientTests.cs
+++ b/Octokit.Tests/Clients/ReferencesClientTests.cs
@@ -1,10 +1,7 @@
using System;
using System.Threading.Tasks;
-
using NSubstitute;
-
using Octokit.Tests.Helpers;
-
using Xunit;
namespace Octokit.Tests.Clients
diff --git a/Octokit.Tests/Models/NewReferenceTests.cs b/Octokit.Tests/Models/NewReferenceTests.cs
index c5e68adf..48cc90ca 100644
--- a/Octokit.Tests/Models/NewReferenceTests.cs
+++ b/Octokit.Tests/Models/NewReferenceTests.cs
@@ -1,7 +1,5 @@
using System;
-
using Octokit;
-
using Xunit;
public class NewReferenceTests
diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
index b41260a2..6a7e72bc 100644
--- a/Octokit.Tests/Octokit.Tests.csproj
+++ b/Octokit.Tests/Octokit.Tests.csproj
@@ -64,6 +64,7 @@
+