diff --git a/src/gcp_storage_emulator/server.py b/src/gcp_storage_emulator/server.py
index 8982dad..58c5bda 100644
--- a/src/gcp_storage_emulator/server.py
+++ b/src/gcp_storage_emulator/server.py
@@ -407,6 +407,14 @@ def __init__(self, host, port, in_memory, default_bucket=None, data_dir=None):
             buckets.create_bucket(default_bucket, self._storage)
         self._api = APIThread(host, port, self._storage)
 
+    # Context Manager
+    def __enter__(self):
+        self.start()
+        return self
+
+    def __exit__(self, *args):
+        self.stop()
+
     def start(self):
         self._api.start()
         self._api.is_running.wait()  # Start the API thread