diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08ac71c41..ee2916f26 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,6 +63,9 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v2
 
+      - name: Restore
+        run: dotnet tool restore
+
       - name: Build
         run: |
           chmod +x ./build.sh
@@ -192,9 +195,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Restore
-        run: |
-          msbuild /t:restore
-          dotnet tool restore
+        run: msbuild /t:restore
         shell: pwsh
 
       - name: Build solution
diff --git a/bitwarden-server.sln b/bitwarden-server.sln
index 1579c1ce5..a726b85bd 100644
--- a/bitwarden-server.sln
+++ b/bitwarden-server.sln
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		appveyor.yml = appveyor.yml
 		build.sh = build.sh
+		.github\workflows\build.yml = .github\workflows\build.yml
 		dotnet-tools.json = dotnet-tools.json
 		LICENSE.txt = LICENSE.txt
 		NuGet.Config = NuGet.Config
@@ -50,7 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventsProcessor", "src\Even
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrator", "util\Migrator\Migrator.csproj", "{54DED792-A022-417E-9804-21FCC9C7C610}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api.Test", "test\Api.Test\Api.Test.csproj", "{860DE301-0B3E-4717-9C21-A9B4C3C2B121}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api.Test", "test\Api.Test\Api.Test.csproj", "{860DE301-0B3E-4717-9C21-A9B4C3C2B121}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution