diff --git a/tests/conftest.py b/tests/conftest.py
index 870c48a32..763adf077 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,10 +1,13 @@
 import json
 from pathlib import Path
 from typing import AsyncGenerator
+from langflow.api.database import get_session
 
 import pytest
 from fastapi.testclient import TestClient
 from httpx import AsyncClient
+from sqlmodel import SQLModel, Session, create_engine
+from sqlmodel.pool import StaticPool
 
 
 def pytest_configure():
@@ -76,3 +79,35 @@ def complex_graph():
 @pytest.fixture
 def openapi_graph():
     return get_graph("openapi")
+
+
+@pytest.fixture
+def json_flow():
+    with open(pytest.BASIC_EXAMPLE_PATH, "r") as f:
+        return f.read()
+
+
+@pytest.fixture(name="session")  #
+def session_fixture():  #
+    engine = create_engine(
+        "sqlite://", connect_args={"check_same_thread": False}, poolclass=StaticPool
+    )
+    SQLModel.metadata.create_all(engine)
+    with Session(engine) as session:
+        yield session
+
+
+@pytest.fixture(name="client")  #
+def client_fixture(session: Session):  #
+    def get_session_override():  #
+        return session
+
+    from langflow.main import create_app
+
+    app = create_app()
+
+    app.dependency_overrides[get_session] = get_session_override  #
+
+    client = TestClient(app)  #
+    yield client  #
+    app.dependency_overrides.clear()  #
diff --git a/tests/test_database.py b/tests/test_database.py
new file mode 100644
index 000000000..247d55e12
--- /dev/null
+++ b/tests/test_database.py
@@ -0,0 +1,58 @@
+from langflow.database.models.flow import FlowCreate
+
+
+def test_create_flow(client, json_flow):
+    flow = FlowCreate(name="Test Flow", flow=json_flow)
+    response = client.post("/flows/", json=flow.dict())
+    assert response.status_code == 200
+    assert response.json()["name"] == flow.name
+    assert response.json()["flow"] == flow.flow
+
+
+def test_read_flows(client, json_flow):
+    flow = FlowCreate(name="Test Flow", flow=json_flow)
+    response = client.post("/flows/", json=flow.dict())
+    assert response.status_code == 200
+    assert response.json()["name"] == flow.name
+    assert response.json()["flow"] == flow.flow
+    flow = FlowCreate(name="Test Flow", flow=json_flow)
+    response = client.post("/flows/", json=flow.dict())
+    assert response.status_code == 200
+    assert response.json()["name"] == flow.name
+    assert response.json()["flow"] == flow.flow
+
+    response = client.get("/flows/")
+    assert response.status_code == 200
+    assert len(response.json()) > 0
+
+
+def test_read_flow(client, json_flow):
+    flow = FlowCreate(name="Test Flow", flow=json_flow)
+    response = client.post("/flows/", json=flow.dict())
+    flow_id = response.json()["id"]
+    response = client.get(f"/flows/{flow_id}")
+    assert response.status_code == 200
+    assert response.json()["name"] == flow.name
+    assert response.json()["flow"] == flow.flow
+
+
+def test_update_flow(client, json_flow):
+    flow = FlowCreate(name="Test Flow", flow=json_flow)
+    response = client.post("/flows/", json=flow.dict())
+    flow_id = response.json()["id"]
+    updated_flow = FlowCreate(
+        name="Updated Flow", flow=json_flow.replace("BasicExample", "Updated Flow")
+    )
+    response = client.put(f"/flows/{flow_id}", json=updated_flow.dict())
+    assert response.status_code == 200
+    assert response.json()["name"] == updated_flow.name
+    assert response.json()["flow"] == updated_flow.flow
+
+
+def test_delete_flow(client, json_flow):
+    flow = FlowCreate(name="Test Flow", flow=json_flow)
+    response = client.post("/flows/", json=flow.dict())
+    flow_id = response.json()["id"]
+    response = client.delete(f"/flows/{flow_id}")
+    assert response.status_code == 200
+    assert response.json()["message"] == "Flow deleted successfully"