diff --git a/build/build.ps1 b/build/build.ps1
index 6e124d1508..3ba347a6dc 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -381,7 +381,7 @@
   {
     Write-Host "Restore NuGet"
     Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
-	$params = "-Source", $nugetsourceUmbraco   
+	$params = "-Source", $nugetsourceUmbraco
     &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log" @params
     if (-not $?) { throw "Failed to restore NuGet packages." }
   })
@@ -535,6 +535,7 @@
   # run
   if (-not $get)
   {
+cd
     if ($command.Length -eq 0)
     {
       $command = @( "Build" )
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypress.json b/src/Umbraco.Tests.AcceptanceTest/cypress.json
new file mode 100644
index 0000000000..9c7ab6552d
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/cypress.json
@@ -0,0 +1,8 @@
+{
+    "viewportHeight": 1024,
+    "viewportWidth": 1200,
+    "env": {
+        "username": "<insert username/email>",
+        "password": "<insert password>"
+    }
+}
diff --git a/src/Umbraco.Tests.AcceptanceTest/cypressWithBaseUrl.cmd b/src/Umbraco.Tests.AcceptanceTest/cypressWithBaseUrl.cmd
new file mode 100644
index 0000000000..1ccb249faf
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/cypressWithBaseUrl.cmd
@@ -0,0 +1,14 @@
+ECHO OFF
+set cypressCommand=%1
+for /f "tokens=*" %%a in ('Powershell.exe "((./../../../build/build.ps1 -g true).GetUmbracoVersion().Semver.ToString())"') do set Port=%%a
+
+REM Remove .'s
+set Port=%Port:.=%
+
+REM pad with 0's so the length is 4
+set "Port=%Port%0"
+set "Port=%Port:~-4%"
+
+set baseUrl=http://localhost:%Port%
+ECHO ON
+npx cypress %cypressCommand% --config baseUrl="%baseUrl%"
diff --git a/src/Umbraco.Tests.AcceptanceTest/package.json b/src/Umbraco.Tests.AcceptanceTest/package.json
new file mode 100644
index 0000000000..3d222a87ec
--- /dev/null
+++ b/src/Umbraco.Tests.AcceptanceTest/package.json
@@ -0,0 +1,12 @@
+{
+  "scripts": {
+    "test": "cypressWithBaseUrl.cmd run",
+    "ui": "cypressWithBaseUrl.cmd open"
+  },
+  "devDependencies": {
+    "cross-env": "^7.0.2",
+    "ncp": "^2.0.0",
+      "cypress": "^4.5.0",
+      "umbraco-cypress-testhelpers": "1.0.0-beta-34"
+  }
+}
diff --git a/src/umbraco.sln b/src/umbraco.sln
index a747f21d19..63fb856b5d 100644
--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -58,6 +58,11 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "ht
 		StartServerOnDebug = "false"
 	EndProjectSection
 EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Tests.AcceptanceTest\", "Umbraco.Tests.AcceptanceTest\", "{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817}"
+	ProjectSection(WebsiteProperties) = preProject
+		SlnRelativePath = "Umbraco.Tests.AcceptanceTest\"
+	EndProjectSection
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web", "Umbraco.Web\Umbraco.Web.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Core", "Umbraco.Core\Umbraco.Core.csproj", "{31785BC3-256C-4613-B2F5-A1B0BDDED8C1}"
@@ -159,6 +164,7 @@ Global
 		{3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 		{C7311C00-2184-409B-B506-52A5FAEA8736} = {FD962632-184C-4005-A5F3-E705D92FC645}
 		{FB5676ED-7A69-492C-B802-E7B24144C0FC} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
+		{9E4C8A12-FBE0-4673-8CE2-DF99D5D57817} = {B5BD12C1-A454-435E-8A46-FF4A364C0382}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A0F2E34-D2AF-4DAB-86A0-7D7764B3D0EC}