diff --git a/bitwarden-mobile.sln b/bitwarden-mobile.sln
index c7e0ac6fd..bc6b5ab99 100644
--- a/bitwarden-mobile.sln
+++ b/bitwarden-mobile.sln
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Core", "src\iOS.Core\iO
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS.Test", "test\iOS.Test\iOS.Test.csproj", "{6702027A-F726-4149-863E-7CB924674B9A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android.Test", "Android.Test\Android.Test.csproj", "{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android.Test", "test\Android.Test\Android.Test.csproj", "{FA507A17-D4E3-46DF-ACD8-D7E6D7D4E3AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Android.Test/Android.Test.csproj b/test/Android.Test/Android.Test.csproj
similarity index 98%
rename from Android.Test/Android.Test.csproj
rename to test/Android.Test/Android.Test.csproj
index 1a9bff47c..593ee075c 100644
--- a/Android.Test/Android.Test.csproj
+++ b/test/Android.Test/Android.Test.csproj
@@ -78,7 +78,7 @@
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\Android\Android.csproj">
+    <ProjectReference Include="..\..\src\Android\Android.csproj">
       <Project>{04b18ed2-b76d-4947-8474-191f8fd2b5e0}</Project>
       <Name>Android</Name>
     </ProjectReference>
diff --git a/Android.Test/Assets/AboutAssets.txt b/test/Android.Test/Assets/AboutAssets.txt
similarity index 100%
rename from Android.Test/Assets/AboutAssets.txt
rename to test/Android.Test/Assets/AboutAssets.txt
diff --git a/Android.Test/KeyDerivationTests.cs b/test/Android.Test/KeyDerivationTests.cs
similarity index 100%
rename from Android.Test/KeyDerivationTests.cs
rename to test/Android.Test/KeyDerivationTests.cs
diff --git a/Android.Test/MainActivity.cs b/test/Android.Test/MainActivity.cs
similarity index 100%
rename from Android.Test/MainActivity.cs
rename to test/Android.Test/MainActivity.cs
diff --git a/Android.Test/Properties/AndroidManifest.xml b/test/Android.Test/Properties/AndroidManifest.xml
similarity index 100%
rename from Android.Test/Properties/AndroidManifest.xml
rename to test/Android.Test/Properties/AndroidManifest.xml
diff --git a/Android.Test/Properties/AssemblyInfo.cs b/test/Android.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from Android.Test/Properties/AssemblyInfo.cs
rename to test/Android.Test/Properties/AssemblyInfo.cs
diff --git a/Android.Test/Resources/AboutResources.txt b/test/Android.Test/Resources/AboutResources.txt
similarity index 100%
rename from Android.Test/Resources/AboutResources.txt
rename to test/Android.Test/Resources/AboutResources.txt
diff --git a/Android.Test/Resources/Resource.Designer.cs b/test/Android.Test/Resources/Resource.Designer.cs
similarity index 100%
rename from Android.Test/Resources/Resource.Designer.cs
rename to test/Android.Test/Resources/Resource.Designer.cs
diff --git a/Android.Test/Resources/drawable/Icon.png b/test/Android.Test/Resources/drawable/Icon.png
similarity index 100%
rename from Android.Test/Resources/drawable/Icon.png
rename to test/Android.Test/Resources/drawable/Icon.png
diff --git a/Android.Test/Resources/values/Strings.xml b/test/Android.Test/Resources/values/Strings.xml
similarity index 100%
rename from Android.Test/Resources/values/Strings.xml
rename to test/Android.Test/Resources/values/Strings.xml
diff --git a/Android.Test/TestSample.cs b/test/Android.Test/TestSample.cs
similarity index 100%
rename from Android.Test/TestSample.cs
rename to test/Android.Test/TestSample.cs
diff --git a/Android.Test/app.config b/test/Android.Test/app.config
similarity index 100%
rename from Android.Test/app.config
rename to test/Android.Test/app.config