diff --git a/cypress.json b/cypress.json
index d1ab2fc04f4..89c8dd9b498 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,3 +1,3 @@
 {
-  "baseUrl": "http://localhost:8080"
+  "baseUrl": "http://localhost:8081"
 }
diff --git a/cypress/BUILD.bazel b/cypress/BUILD.bazel
deleted file mode 100644
index 03bb50887eb..00000000000
--- a/cypress/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-load("@cypress//:index.bzl", "cypress_web_test")
-load("@npm//@bazel/typescript:index.bzl", "ts_project")
-
-package(default_visibility = ["//visibility:public"])
-
-# You must create a cypress plugin in order to boot a server to server your application.
-# It can be written as a javascript file or in typescript using ts_library or ts_project.
-ts_project(
-    name = "plugins_file",
-    testonly = True,
-    srcs = ["plugins/index.ts"],
-    declaration = True,
-    tsconfig = "//:tsconfig",
-    deps = [
-        "@npm//@types/node",
-        "@npm//cypress",
-    ],
-)
-
-ts_project(
-    name = "integration_specs",
-    testonly = True,
-    srcs = glob(["integration/**/*.ts"]),
-    declaration = True,
-    tsconfig = "//:tsconfig",
-    deps = [
-        "@npm//@types/node",
-        "@npm//cypress",
-    ],
-)
-
-cypress_web_test(
-    name = "cypress",
-    srcs = [":integration_specs"],
-    config_file = "//:cypress.json",
-    data = [
-        "//integration:server",
-    ],
-    plugins_file = ":plugins_file",
-    tags = ["e2e"],
-)
diff --git a/cypress/integration/hello_static_spec.ts b/cypress/integration/hello_static_spec.ts
index 08b479c060c..40096b26e59 100644
--- a/cypress/integration/hello_static_spec.ts
+++ b/cypress/integration/hello_static_spec.ts
@@ -18,7 +18,7 @@ describe('hello_static', () => {
     cy.on('window:alert', (txt) => {
       // electron does not have alert, so this part of the test does not execute
       // in electron.
-      expect(txt).to.contains('Hello World!!!');
+      expect(txt).to.contain('Hello World!!!');
     });
   });
 });
diff --git a/cypress/integration/todo_spec.ts b/cypress/integration/todo_spec.ts
index 77d601830c9..be8b9adbcf6 100644
--- a/cypress/integration/todo_spec.ts
+++ b/cypress/integration/todo_spec.ts
@@ -40,7 +40,7 @@ describe('todo', () => {
       });
 
       it('should edit an item', function () {
-        cy.get('.todo-list>li:first-child').dblclick();
+        cy.get('.todo-list>li:first-child label').dblclick();
         cy.wait(50);
         cy.get('.todo-list>li:first-child input.edit').type('123{enter}');
         cy.get('.todo-list>li:first-child').should((item: any) =>