diff --git a/tests/unit/services/openai_gateway/schema_test.py b/tests/unit/services/openai_gateway/schema_test.py
new file mode 100644
index 00000000..8ab998c7
--- /dev/null
+++ b/tests/unit/services/openai_gateway/schema_test.py
@@ -0,0 +1,11 @@
+# retoor <retoor@molodetz.nl>
+
+from devplacepy.database import get_setting, set_setting
+from devplacepy.database.schema import migrate_ai_gateway_settings
+
+
+def test_migrate_embed_key_populates_db(local_db, monkeypatch):
+    monkeypatch.setenv("OPENROUTER_API_KEY", "sk-or-v1-test-embed-key")
+    set_setting("gateway_embed_key", "")
+    migrate_ai_gateway_settings()
+    assert get_setting("gateway_embed_key", "") == "sk-or-v1-test-embed-key"
diff --git a/tests/unit/services/openai_gateway/service_test.py b/tests/unit/services/openai_gateway/service_test.py
new file mode 100644
index 00000000..b2ac4feb
--- /dev/null
+++ b/tests/unit/services/openai_gateway/service_test.py
@@ -0,0 +1,12 @@
+# retoor <retoor@molodetz.nl>
+
+from devplacepy.database import set_setting
+from devplacepy.services.openai_gateway import GatewayService
+
+
+def test_effective_config_fallback_embed_key(local_db):
+    set_setting("gateway_embed_key", "")
+    set_setting("gateway_vision_key", "sk-or-v1-vision-test-key")
+    svc = GatewayService()
+    cfg = svc.effective_config()
+    assert cfg["gateway_embed_key"] == "sk-or-v1-vision-test-key"