diff --git a/imagecreator/backend/app/api/__pycache__/history.cpython-310.pyc b/imagecreator/backend/app/api/__pycache__/history.cpython-310.pyc
index 2abe7f5..cb84b26 100644
Binary files a/imagecreator/backend/app/api/__pycache__/history.cpython-310.pyc and b/imagecreator/backend/app/api/__pycache__/history.cpython-310.pyc differ
diff --git a/imagecreator/backend/app/api/__pycache__/images.cpython-310.pyc b/imagecreator/backend/app/api/__pycache__/images.cpython-310.pyc
index b262bfa..182aa54 100644
Binary files a/imagecreator/backend/app/api/__pycache__/images.cpython-310.pyc and b/imagecreator/backend/app/api/__pycache__/images.cpython-310.pyc differ
diff --git a/imagecreator/backend/app/api/history.py b/imagecreator/backend/app/api/history.py
index 4d5194a..85c443a 100644
--- a/imagecreator/backend/app/api/history.py
+++ b/imagecreator/backend/app/api/history.py
@@ -1,3 +1,54 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends, HTTPException, status
+from sqlalchemy.orm import Session
+from typing import List
+from uuid import UUID
 
-router = APIRouter()
\ No newline at end of file
+from app.database import get_db
+from app.api.deps import get_current_user
+from app.models.user import User
+from app.models.history import GenerationHistory
+from app.schemas.history import HistoryResponse
+
+router = APIRouter()
+
+@router.get("", response_model=List[HistoryResponse])
+def get_history(
+    current_user: User = Depends(get_current_user),
+    db: Session = Depends(get_db)
+):
+    items = db.query(GenerationHistory).filter(
+        GenerationHistory.user_id == current_user.id
+    ).order_by(GenerationHistory.created_at.desc()).all()
+    return items
+
+@router.get("/{history_id}", response_model=HistoryResponse)
+def get_history_item(
+    history_id: UUID,
+    current_user: User = Depends(get_current_user),
+    db: Session = Depends(get_db)
+):
+    item = db.query(GenerationHistory).filter(
+        GenerationHistory.id == history_id,
+        GenerationHistory.user_id == current_user.id
+    ).first()
+
+    if not item:
+        raise HTTPException(status_code=404, detail="History item not found")
+    return item
+
+@router.delete("/{history_id}", status_code=status.HTTP_204_NO_CONTENT)
+def delete_history_item(
+    history_id: UUID,
+    current_user: User = Depends(get_current_user),
+    db: Session = Depends(get_db)
+):
+    item = db.query(GenerationHistory).filter(
+        GenerationHistory.id == history_id,
+        GenerationHistory.user_id == current_user.id
+    ).first()
+
+    if not item:
+        raise HTTPException(status_code=404, detail="History item not found")
+
+    db.delete(item)
+    db.commit()
\ No newline at end of file
diff --git a/imagecreator/backend/app/schemas/__pycache__/history.cpython-310.pyc b/imagecreator/backend/app/schemas/__pycache__/history.cpython-310.pyc
new file mode 100644
index 0000000..965d944
Binary files /dev/null and b/imagecreator/backend/app/schemas/__pycache__/history.cpython-310.pyc differ
diff --git a/imagecreator/backend/app/schemas/__pycache__/image.cpython-310.pyc b/imagecreator/backend/app/schemas/__pycache__/image.cpython-310.pyc
new file mode 100644
index 0000000..d60bd84
Binary files /dev/null and b/imagecreator/backend/app/schemas/__pycache__/image.cpython-310.pyc differ
diff --git a/imagecreator/backend/app/schemas/history.py b/imagecreator/backend/app/schemas/history.py
index 5fdb0ea..96b9946 100644
--- a/imagecreator/backend/app/schemas/history.py
+++ b/imagecreator/backend/app/schemas/history.py
@@ -1 +1,17 @@
-"""History schemas placeholder."""
+from pydantic import BaseModel
+from typing import Optional
+from datetime import datetime
+from uuid import UUID
+
+class HistoryResponse(BaseModel):
+    id: UUID
+    original_prompt: str
+    optimized_prompt: str
+    mode: str
+    model: str
+    image_url: str
+    input_image_url: Optional[str] = None
+    created_at: datetime
+
+    class Config:
+        from_attributes = True
\ No newline at end of file
diff --git a/imagecreator/backend/tests/__pycache__/test_history_api.cpython-310-pytest-9.0.2.pyc b/imagecreator/backend/tests/__pycache__/test_history_api.cpython-310-pytest-9.0.2.pyc
new file mode 100644
index 0000000..491ec6d
Binary files /dev/null and b/imagecreator/backend/tests/__pycache__/test_history_api.cpython-310-pytest-9.0.2.pyc differ
diff --git a/imagecreator/backend/tests/__pycache__/test_images_api.cpython-310-pytest-9.0.2.pyc b/imagecreator/backend/tests/__pycache__/test_images_api.cpython-310-pytest-9.0.2.pyc
new file mode 100644
index 0000000..1457433
Binary files /dev/null and b/imagecreator/backend/tests/__pycache__/test_images_api.cpython-310-pytest-9.0.2.pyc differ
diff --git a/imagecreator/backend/tests/test_history_api.py b/imagecreator/backend/tests/test_history_api.py
new file mode 100644
index 0000000..32876d0
--- /dev/null
+++ b/imagecreator/backend/tests/test_history_api.py
@@ -0,0 +1,160 @@
+import pytest
+import os
+from fastapi.testclient import TestClient
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from app.database import Base, get_db
+from app.main import app
+from app.models.user import User
+from app.models.history import GenerationHistory, GenerationMode
+from app.core.security import hash_password, create_access_token
+
+TEST_DB_PATH = "/tmp/test_history.db"
+if os.path.exists(TEST_DB_PATH):
+    os.remove(TEST_DB_PATH)
+
+engine = create_engine(f"sqlite:///{TEST_DB_PATH}", connect_args={"check_same_thread": False})
+TestSessionLocal = sessionmaker(bind=engine)
+
+def override_get_db():
+    db = TestSessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
+
+app.dependency_overrides[get_db] = override_get_db
+client = TestClient(app)
+
+Base.metadata.create_all(bind=engine)
+
+def get_auth_header(user_id):
+    token = create_access_token({"sub": str(user_id)})
+    return {"Authorization": f"Bearer {token}"}
+
+def test_get_history_empty():
+    db = TestSessionLocal()
+    user = User(username="histtest", email="hist@example.com", hashed_password=hash_password("pass"))
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    user_id = user.id
+    db.close()
+
+    response = client.get("/api/history", headers=get_auth_header(user_id))
+    assert response.status_code == 200
+    assert response.json() == []
+
+def test_get_history_with_items():
+    db = TestSessionLocal()
+    user = User(username="histtest2", email="hist2@example.com", hashed_password=hash_password("pass"))
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    user_id = user.id
+
+    history = GenerationHistory(
+        user_id=user_id,
+        original_prompt="a cat",
+        optimized_prompt="a fluffy orange cat",
+        mode=GenerationMode.TEXT2IMAGE,
+        model="gemini",
+        image_url="/images/cat.png"
+    )
+    db.add(history)
+    db.commit()
+    db.close()
+
+    response = client.get("/api/history", headers=get_auth_header(user_id))
+    assert response.status_code == 200
+    data = response.json()
+    assert len(data) == 1
+    assert data[0]["original_prompt"] == "a cat"
+
+def test_get_history_item_by_id():
+    db = TestSessionLocal()
+    user = User(username="histtest3", email="hist3@example.com", hashed_password=hash_password("pass"))
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    user_id = user.id
+
+    history = GenerationHistory(
+        user_id=user_id,
+        original_prompt="a dog",
+        optimized_prompt="a fluffy brown dog",
+        mode=GenerationMode.TEXT2IMAGE,
+        model="gemini",
+        image_url="/images/dog.png"
+    )
+    db.add(history)
+    db.commit()
+    db.refresh(history)
+    history_id = history.id
+    db.close()
+
+    response = client.get(f"/api/history/{history_id}", headers=get_auth_header(user_id))
+    assert response.status_code == 200
+    data = response.json()
+    assert data["original_prompt"] == "a dog"
+
+def test_get_history_item_not_found():
+    db = TestSessionLocal()
+    user = User(username="histtest4", email="hist4@example.com", hashed_password=hash_password("pass"))
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    user_id = user.id
+    db.close()
+
+    from uuid import uuid4
+    fake_id = uuid4()
+
+    response = client.get(f"/api/history/{fake_id}", headers=get_auth_header(user_id))
+    assert response.status_code == 404
+
+def test_delete_history_item():
+    db = TestSessionLocal()
+    user = User(username="histtest5", email="hist5@example.com", hashed_password=hash_password("pass"))
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    user_id = user.id
+
+    history = GenerationHistory(
+        user_id=user_id,
+        original_prompt="a bird",
+        optimized_prompt="a colorful bird",
+        mode=GenerationMode.TEXT2IMAGE,
+        model="gemini",
+        image_url="/images/bird.png"
+    )
+    db.add(history)
+    db.commit()
+    db.refresh(history)
+    history_id = history.id
+    db.close()
+
+    response = client.delete(f"/api/history/{history_id}", headers=get_auth_header(user_id))
+    assert response.status_code == 204
+
+    # Verify deleted
+    db = TestSessionLocal()
+    deleted = db.query(GenerationHistory).filter(GenerationHistory.id == history_id).first()
+    db.close()
+    assert deleted is None
+
+def test_delete_history_item_not_found():
+    db = TestSessionLocal()
+    user = User(username="histtest6", email="hist6@example.com", hashed_password=hash_password("pass"))
+    db.add(user)
+    db.commit()
+    db.refresh(user)
+    user_id = user.id
+    db.close()
+
+    from uuid import uuid4
+    fake_id = uuid4()
+
+    response = client.delete(f"/api/history/{fake_id}", headers=get_auth_header(user_id))
+    assert response.status_code == 404
\ No newline at end of file