diff --git a/Jenkinsfile.public b/Jenkinsfile.public
index c9aae3503..b23a56326 100644
--- a/Jenkinsfile.public
+++ b/Jenkinsfile.public
@@ -31,7 +31,7 @@ pipeline {
 
                 // download dependencies
                 sh 'go mod download'
-                sh 'cd testsuite && go mod download'
+                sh 'cd testsuite/ui && go mod download'
 
                 // pre-check that we cannot do at a later stage reliably
                 sh 'check-large-files'
@@ -143,7 +143,7 @@ pipeline {
 
                         sh 'protolock status'
 
-                        dir("testsuite") {
+                        dir("testsuite/ui") {
                             sh 'check-imports ./...'
                             sh 'check-atomic-align ./...'
                             sh 'check-monkit ./...'
@@ -386,7 +386,7 @@ pipeline {
             steps {
                 sh 'psql -U postgres -c \'create database testui;\''
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'cd testsuite && go test -parallel 1 -p 1 -short -vet=off -timeout 5m -json -race ./... 2>&1 | tee ../.build/ui-tests.json | xunit -out ../.build/ui-tests.xml'
+                    sh 'cd testsuite/ui && go test -parallel 1 -p 1 -short -vet=off -timeout 5m -json -race ./... 2>&1 | tee ../../.build/ui-tests.json | xunit -out ../../.build/ui-tests.xml'
                 }
             }
             post {
diff --git a/Makefile b/Makefile
index 00b7dc841..1f223d670 100644
--- a/Makefile
+++ b/Makefile
@@ -129,10 +129,10 @@ lint:
 		storjlabs/ci-slim \
 		make .lint LINT_TARGET="$(LINT_TARGET)"
 
-.PHONY: .lint/testsuite
-.lint/testsuite:
+.PHONY: .lint/testsuite/ui
+.lint/testsuite/ui:
 	go run ./scripts/lint.go \
-		-work-dir testsuite \
+		-work-dir testsuite/ui \
 		-parallel 4 \
 		-imports \
 		-atomic-align \
@@ -141,14 +141,14 @@ lint:
 		-golangci \
 		$(LINT_TARGET)
 
-.PHONY: lint/testsuite
-lint/testsuite:
+.PHONY: lint/testsuite/ui
+lint/testsuite/ui:
 	docker run --rm -it \
 		-v ${GOPATH}/pkg:/go/pkg \
 		-v ${PWD}:/storj \
 		-w /storj \
 		storjlabs/ci \
-		make .lint/testsuite LINT_TARGET="$(LINT_TARGET)"
+		make .lint/testsuite/ui LINT_TARGET="$(LINT_TARGET)"
 
 ##@ Test
 
@@ -568,7 +568,7 @@ diagrams-graphml:
 bump-dependencies:
 	go get storj.io/common@main storj.io/private@main storj.io/uplink@main
 	go mod tidy
-	cd testsuite;\
+	cd testsuite/ui;\
 		go get storj.io/common@main storj.io/storj@main storj.io/uplink@main;\
 		go mod tidy;
 
diff --git a/testsuite/go.mod b/testsuite/ui/go.mod
similarity index 99%
rename from testsuite/go.mod
rename to testsuite/ui/go.mod
index d723dbb7c..3e92a0089 100644
--- a/testsuite/go.mod
+++ b/testsuite/ui/go.mod
@@ -1,8 +1,8 @@
-module storj.io/storj/testsuite
+module storj.io/storj/testsuite/ui
 
 go 1.17
 
-replace storj.io/storj => ../
+replace storj.io/storj => ../../
 
 require (
 	github.com/go-rod/rod v0.101.8
diff --git a/testsuite/go.sum b/testsuite/ui/go.sum
similarity index 100%
rename from testsuite/go.sum
rename to testsuite/ui/go.sum