diff --git a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Authentication/TestAuthenticatedUntappdCredentials.cs
similarity index 94%
rename from src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs
rename to src/Untappd.Net.UnitTests/Authentication/TestAuthenticatedUntappdCredentials.cs
index 9b0fac7..4105378 100644
--- a/src/Untappd.Net.UnitTests/Client/TestAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net.UnitTests/Authentication/TestAuthenticatedUntappdCredentials.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Untappd.Net.Authentication;
 
-namespace Untappd.Net.UnitTests.Client
+namespace Untappd.Net.UnitTests.Authentication
 {
     [TestFixture]
     public class TestAuthenticatedUntappdCredentials
diff --git a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs b/src/Untappd.Net.UnitTests/Authentication/TestUnAuthenticatedUntappdCredentials.cs
similarity index 92%
rename from src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs
rename to src/Untappd.Net.UnitTests/Authentication/TestUnAuthenticatedUntappdCredentials.cs
index 612de67..3202d18 100644
--- a/src/Untappd.Net.UnitTests/Client/TestUnAuthenticatedUntappdCredentials.cs
+++ b/src/Untappd.Net.UnitTests/Authentication/TestUnAuthenticatedUntappdCredentials.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Untappd.Net.Authentication;
 
-namespace Untappd.Net.UnitTests.Client
+namespace Untappd.Net.UnitTests.Authentication
 {
     [TestFixture]
     public class TestUnAuthenticatedUntappdCredentials
diff --git a/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs b/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
index aec075e..7088f99 100644
--- a/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
+++ b/src/Untappd.Net.UnitTests/Responses/TestDeserializer.cs
@@ -18,7 +18,7 @@ using Untappd.Net.Responses.VenueInfo;
 using UserDistinctBeers = Untappd.Net.Responses.UserDistinctBeer;
 using UserWishList = Untappd.Net.Responses.UserWishlist;
 
-namespace Untappd.Net.UnitTests
+namespace Untappd.Net.UnitTests.Responses
 {
     [TestFixture]
     public class TestDeserializer
diff --git a/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj b/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj
index d5a937d..50e05b0 100644
--- a/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj
+++ b/src/Untappd.Net.UnitTests/Untappd.Net.UnitTests.csproj
@@ -73,8 +73,8 @@
     <Compile Include="Responses\Actions\TestSimpleActions.cs" />
     <Compile Include="Responses\TestDeserializer.cs" />
     <Compile Include="Authentication\TestAuthenticationHelper.cs" />
-    <Compile Include="Client\TestAuthenticatedUntappdCredentials.cs" />
-    <Compile Include="Client\TestUnAuthenticatedUntappdCredentials.cs" />
+    <Compile Include="Authentication\TestAuthenticatedUntappdCredentials.cs" />
+    <Compile Include="Authentication\TestUnAuthenticatedUntappdCredentials.cs" />
     <Compile Include="Exception\TestBaseUntappdException.cs" />
     <Compile Include="Exception\TestEndpointConfigurationException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />