diff --git a/run.sh b/run.sh
index 4c92fd06af..f45d3dd8de 100755
--- a/run.sh
+++ b/run.sh
@@ -53,10 +53,8 @@ stop() {
 }
 
 cypress-ci() {
-
   echo "Running cypress"
 
-
   export CYPRESS_BASE_URL=http://localhost:11633
   export POKEMON_HTTP_ENDPOINT=http://demo-api:8081
 
@@ -65,10 +63,8 @@ cypress-ci() {
 }
 
 cypress() {
-
   echo "Running cypress"
 
-
   export CYPRESS_BASE_URL=http://localhost:11633
   export POKEMON_HTTP_ENDPOINT=http://demo-api:8081
 
diff --git a/server/test/test_repository.go b/server/test/test_repository.go
index 633507c533..f5b5c6e707 100644
--- a/server/test/test_repository.go
+++ b/server/test/test_repository.go
@@ -85,7 +85,7 @@ const (
 	) as ltr ON ltr.test_id = t.id AND ltr.tenant_id = t.tenant_id
 	LEFT OUTER JOIN
 		test_runs last_test_run
-	ON last_test_run.test_id = ltr.test_id AND last_test_run.id = ltr.id
+		ON last_test_run.test_id = ltr.test_id AND last_test_run.id = ltr.id AND last_test_run.tenant_id = ltr.tenant_id
 `
 
 	testMaxVersionQuery = `