diff --git a/Makefile b/Makefile
index 88f3b99c2..69507a55c 100644
--- a/Makefile
+++ b/Makefile
@@ -74,13 +74,13 @@ coverage: ## run the tests and generate a coverage report
 
 # allow passing arguments to pytest
 unit_tests: ## run unit tests
-	poetry run pytest \
-		--ignore=tests/integration \
+	poetry run pytest src/backend/tests \
+		--ignore=src/backend/tests/integration \
 		--instafail -ra -n auto -m "not api_key_required" \
 		$(args)
 
 integration_tests: ## run integration tests
-	poetry run pytest tests/integration \
+	poetry run pytest src/backend/tests/integration \
 		--instafail -ra -n auto \
 		$(args)
 
diff --git a/tests/conftest.py b/src/backend/tests/conftest.py
similarity index 100%
rename from tests/conftest.py
rename to src/backend/tests/conftest.py
diff --git a/tests/data/BasicChatwithPromptandHistory.json b/src/backend/tests/data/BasicChatwithPromptandHistory.json
similarity index 100%
rename from tests/data/BasicChatwithPromptandHistory.json
rename to src/backend/tests/data/BasicChatwithPromptandHistory.json
diff --git a/tests/data/ChatInputTest.json b/src/backend/tests/data/ChatInputTest.json
similarity index 100%
rename from tests/data/ChatInputTest.json
rename to src/backend/tests/data/ChatInputTest.json
diff --git a/tests/data/Openapi.json b/src/backend/tests/data/Openapi.json
similarity index 100%
rename from tests/data/Openapi.json
rename to src/backend/tests/data/Openapi.json
diff --git a/tests/data/SimpleAPITest.json b/src/backend/tests/data/SimpleAPITest.json
similarity index 100%
rename from tests/data/SimpleAPITest.json
rename to src/backend/tests/data/SimpleAPITest.json
diff --git a/tests/data/TwoOutputsTest.json b/src/backend/tests/data/TwoOutputsTest.json
similarity index 100%
rename from tests/data/TwoOutputsTest.json
rename to src/backend/tests/data/TwoOutputsTest.json
diff --git a/tests/data/Vector_store.json b/src/backend/tests/data/Vector_store.json
similarity index 100%
rename from tests/data/Vector_store.json
rename to src/backend/tests/data/Vector_store.json
diff --git a/tests/data/WebhookTest.json b/src/backend/tests/data/WebhookTest.json
similarity index 100%
rename from tests/data/WebhookTest.json
rename to src/backend/tests/data/WebhookTest.json
diff --git a/tests/data/basic_example.json b/src/backend/tests/data/basic_example.json
similarity index 100%
rename from tests/data/basic_example.json
rename to src/backend/tests/data/basic_example.json
diff --git a/tests/data/complex_example.json b/src/backend/tests/data/complex_example.json
similarity index 100%
rename from tests/data/complex_example.json
rename to src/backend/tests/data/complex_example.json
diff --git a/tests/data/component.py b/src/backend/tests/data/component.py
similarity index 100%
rename from tests/data/component.py
rename to src/backend/tests/data/component.py
diff --git a/tests/data/component_multiple_outputs.py b/src/backend/tests/data/component_multiple_outputs.py
similarity index 100%
rename from tests/data/component_multiple_outputs.py
rename to src/backend/tests/data/component_multiple_outputs.py
diff --git a/tests/data/component_nested_call.py b/src/backend/tests/data/component_nested_call.py
similarity index 100%
rename from tests/data/component_nested_call.py
rename to src/backend/tests/data/component_nested_call.py
diff --git a/tests/data/component_with_templatefield.py b/src/backend/tests/data/component_with_templatefield.py
similarity index 100%
rename from tests/data/component_with_templatefield.py
rename to src/backend/tests/data/component_with_templatefield.py
diff --git a/tests/data/grouped_chat.json b/src/backend/tests/data/grouped_chat.json
similarity index 100%
rename from tests/data/grouped_chat.json
rename to src/backend/tests/data/grouped_chat.json
diff --git a/tests/data/one_group_chat.json b/src/backend/tests/data/one_group_chat.json
similarity index 100%
rename from tests/data/one_group_chat.json
rename to src/backend/tests/data/one_group_chat.json
diff --git a/tests/data/vector_store_grouped.json b/src/backend/tests/data/vector_store_grouped.json
similarity index 100%
rename from tests/data/vector_store_grouped.json
rename to src/backend/tests/data/vector_store_grouped.json
diff --git a/tests/integration/__init__.py b/src/backend/tests/integration/__init__.py
similarity index 100%
rename from tests/integration/__init__.py
rename to src/backend/tests/integration/__init__.py
diff --git a/tests/integration/astra/__init__.py b/src/backend/tests/integration/astra/__init__.py
similarity index 100%
rename from tests/integration/astra/__init__.py
rename to src/backend/tests/integration/astra/__init__.py
diff --git a/tests/integration/astra/test_astra_component.py b/src/backend/tests/integration/astra/test_astra_component.py
similarity index 100%
rename from tests/integration/astra/test_astra_component.py
rename to src/backend/tests/integration/astra/test_astra_component.py
diff --git a/tests/integration/langflow.py b/src/backend/tests/integration/langflow.py
similarity index 100%
rename from tests/integration/langflow.py
rename to src/backend/tests/integration/langflow.py
diff --git a/tests/integration/utils.py b/src/backend/tests/integration/utils.py
similarity index 100%
rename from tests/integration/utils.py
rename to src/backend/tests/integration/utils.py
diff --git a/tests/locust/locustfile.py b/src/backend/tests/locust/locustfile.py
similarity index 100%
rename from tests/locust/locustfile.py
rename to src/backend/tests/locust/locustfile.py
diff --git a/tests/locust/names.txt b/src/backend/tests/locust/names.txt
similarity index 100%
rename from tests/locust/names.txt
rename to src/backend/tests/locust/names.txt
diff --git a/tests/test_endpoints.py b/src/backend/tests/test_endpoints.py
similarity index 100%
rename from tests/test_endpoints.py
rename to src/backend/tests/test_endpoints.py
diff --git a/tests/test_messages_endpoints.py b/src/backend/tests/test_messages_endpoints.py
similarity index 100%
rename from tests/test_messages_endpoints.py
rename to src/backend/tests/test_messages_endpoints.py
diff --git a/tests/test_schema.py b/src/backend/tests/test_schema.py
similarity index 100%
rename from tests/test_schema.py
rename to src/backend/tests/test_schema.py
diff --git a/tests/test_user.py b/src/backend/tests/test_user.py
similarity index 100%
rename from tests/test_user.py
rename to src/backend/tests/test_user.py
diff --git a/tests/test_webhook.py b/src/backend/tests/test_webhook.py
similarity index 100%
rename from tests/test_webhook.py
rename to src/backend/tests/test_webhook.py
diff --git a/tests/unit/__init__.py b/src/backend/tests/unit/__init__.py
similarity index 100%
rename from tests/unit/__init__.py
rename to src/backend/tests/unit/__init__.py
diff --git a/tests/unit/graph/graph/test_runnable_vertices_manager.py b/src/backend/tests/unit/graph/graph/test_runnable_vertices_manager.py
similarity index 100%
rename from tests/unit/graph/graph/test_runnable_vertices_manager.py
rename to src/backend/tests/unit/graph/graph/test_runnable_vertices_manager.py
diff --git a/tests/unit/graph/graph/test_utils.py b/src/backend/tests/unit/graph/graph/test_utils.py
similarity index 100%
rename from tests/unit/graph/graph/test_utils.py
rename to src/backend/tests/unit/graph/graph/test_utils.py
diff --git a/tests/unit/test_api_key.py b/src/backend/tests/unit/test_api_key.py
similarity index 100%
rename from tests/unit/test_api_key.py
rename to src/backend/tests/unit/test_api_key.py
diff --git a/tests/unit/test_cache.py b/src/backend/tests/unit/test_cache.py
similarity index 100%
rename from tests/unit/test_cache.py
rename to src/backend/tests/unit/test_cache.py
diff --git a/tests/unit/test_cli.py b/src/backend/tests/unit/test_cli.py
similarity index 100%
rename from tests/unit/test_cli.py
rename to src/backend/tests/unit/test_cli.py
diff --git a/tests/unit/test_custom_component.py b/src/backend/tests/unit/test_custom_component.py
similarity index 99%
rename from tests/unit/test_custom_component.py
rename to src/backend/tests/unit/test_custom_component.py
index 39636d28f..a0e5525cb 100644
--- a/tests/unit/test_custom_component.py
+++ b/src/backend/tests/unit/test_custom_component.py
@@ -14,7 +14,7 @@ from langflow.services.database.models.flow import Flow, FlowCreate
 
 @pytest.fixture
 def code_component_with_multiple_outputs():
-    with open("tests/data/component_multiple_outputs.py", "r") as f:
+    with open("src/backend/tests/data/component_multiple_outputs.py", "r") as f:
         code = f.read()
         return Component(code=code)
 
diff --git a/tests/unit/test_data_class.py b/src/backend/tests/unit/test_data_class.py
similarity index 100%
rename from tests/unit/test_data_class.py
rename to src/backend/tests/unit/test_data_class.py
diff --git a/tests/unit/test_data_components.py b/src/backend/tests/unit/test_data_components.py
similarity index 98%
rename from tests/unit/test_data_components.py
rename to src/backend/tests/unit/test_data_components.py
index 13505b5ab..bee801d84 100644
--- a/tests/unit/test_data_components.py
+++ b/src/backend/tests/unit/test_data_components.py
@@ -184,7 +184,7 @@ def test_directory_without_mocks():
     # check if the directory component can load them
     # just check if the number of results is the same as the number of files
     directory_component = data.DirectoryComponent()
-    docs_path = Path(__file__).parent.parent.parent / "docs" / "docs" / "Components"
+    docs_path = Path(__file__).parent.parent.parent.parent.parent / "docs" / "docs" / "Components"
     directory_component.set_attributes({"path": str(docs_path), "use_multithreading": False})
     results = directory_component.load_directory()
     docs_files = list(docs_path.glob("*.md")) + list(docs_path.glob("*.json"))
diff --git a/tests/unit/test_database.py b/src/backend/tests/unit/test_database.py
similarity index 100%
rename from tests/unit/test_database.py
rename to src/backend/tests/unit/test_database.py
diff --git a/tests/unit/test_files.py b/src/backend/tests/unit/test_files.py
similarity index 100%
rename from tests/unit/test_files.py
rename to src/backend/tests/unit/test_files.py
diff --git a/tests/unit/test_frontend_nodes.py b/src/backend/tests/unit/test_frontend_nodes.py
similarity index 100%
rename from tests/unit/test_frontend_nodes.py
rename to src/backend/tests/unit/test_frontend_nodes.py
diff --git a/tests/unit/test_graph.py b/src/backend/tests/unit/test_graph.py
similarity index 100%
rename from tests/unit/test_graph.py
rename to src/backend/tests/unit/test_graph.py
diff --git a/tests/unit/test_helper_components.py b/src/backend/tests/unit/test_helper_components.py
similarity index 100%
rename from tests/unit/test_helper_components.py
rename to src/backend/tests/unit/test_helper_components.py
diff --git a/tests/unit/test_initial_setup.py b/src/backend/tests/unit/test_initial_setup.py
similarity index 100%
rename from tests/unit/test_initial_setup.py
rename to src/backend/tests/unit/test_initial_setup.py
diff --git a/tests/unit/test_kubernetes_secrets.py b/src/backend/tests/unit/test_kubernetes_secrets.py
similarity index 100%
rename from tests/unit/test_kubernetes_secrets.py
rename to src/backend/tests/unit/test_kubernetes_secrets.py
diff --git a/tests/unit/test_loading.py b/src/backend/tests/unit/test_loading.py
similarity index 100%
rename from tests/unit/test_loading.py
rename to src/backend/tests/unit/test_loading.py
diff --git a/tests/unit/test_logger.py b/src/backend/tests/unit/test_logger.py
similarity index 100%
rename from tests/unit/test_logger.py
rename to src/backend/tests/unit/test_logger.py
diff --git a/tests/unit/test_login.py b/src/backend/tests/unit/test_login.py
similarity index 100%
rename from tests/unit/test_login.py
rename to src/backend/tests/unit/test_login.py
diff --git a/tests/unit/test_messages.py b/src/backend/tests/unit/test_messages.py
similarity index 100%
rename from tests/unit/test_messages.py
rename to src/backend/tests/unit/test_messages.py
diff --git a/tests/unit/test_process.py b/src/backend/tests/unit/test_process.py
similarity index 100%
rename from tests/unit/test_process.py
rename to src/backend/tests/unit/test_process.py
diff --git a/tests/unit/test_setup_superuser.py b/src/backend/tests/unit/test_setup_superuser.py
similarity index 100%
rename from tests/unit/test_setup_superuser.py
rename to src/backend/tests/unit/test_setup_superuser.py
diff --git a/tests/unit/test_telemetry.py b/src/backend/tests/unit/test_telemetry.py
similarity index 100%
rename from tests/unit/test_telemetry.py
rename to src/backend/tests/unit/test_telemetry.py
diff --git a/tests/unit/test_template.py b/src/backend/tests/unit/test_template.py
similarity index 100%
rename from tests/unit/test_template.py
rename to src/backend/tests/unit/test_template.py
diff --git a/tests/unit/test_validate_code.py b/src/backend/tests/unit/test_validate_code.py
similarity index 100%
rename from tests/unit/test_validate_code.py
rename to src/backend/tests/unit/test_validate_code.py
diff --git a/tests/unit/text_experimental_components.py b/src/backend/tests/unit/text_experimental_components.py
similarity index 100%
rename from tests/unit/text_experimental_components.py
rename to src/backend/tests/unit/text_experimental_components.py