diff --git a/tests/conftest.py b/tests/conftest.py
index f7c26b64..b70deb87 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -39,14 +39,14 @@ def model_dir(search_config):
     model_dir = search_config.asymmetric.model_directory
 
     # Generate Image Embeddings from Test Images
-    # content_config = ContentConfig()
-    # content_config.image = ImageContentConfig(
-    #     input_directories = ['tests/data/images'],
-    #     embeddings_file = model_dir.joinpath('image_embeddings.pt'),
-    #     batch_size = 10,
-    #     use_xmp_metadata = False)
+    content_config = ContentConfig()
+    content_config.image = ImageContentConfig(
+        input_directories = ['tests/data/images'],
+        embeddings_file = model_dir.joinpath('image_embeddings.pt'),
+        batch_size = 10,
+        use_xmp_metadata = False)
 
-    # image_search.setup(content_config.image, search_config.image, regenerate=False, verbose=True)
+    image_search.setup(content_config.image, search_config.image, regenerate=False, verbose=True)
 
     # Generate Notes Embeddings from Test Notes
     content_config.org = TextContentConfig(
@@ -69,10 +69,10 @@ def content_config(model_dir):
         compressed_jsonl = model_dir.joinpath('notes.jsonl.gz'),
         embeddings_file = model_dir.joinpath('note_embeddings.pt'))
 
-    # content_config.image = ImageContentConfig(
-    #     input_directories = ['tests/data/images'],
-    #     embeddings_file = model_dir.joinpath('image_embeddings.pt'),
-    #     batch_size = 10,
-    #     use_xmp_metadata = False)
+    content_config.image = ImageContentConfig(
+        input_directories = ['tests/data/images'],
+        embeddings_file = model_dir.joinpath('image_embeddings.pt'),
+        batch_size = 1,
+        use_xmp_metadata = False)
 
     return content_config
\ No newline at end of file
diff --git a/tests/test_client.py b/tests/test_client.py
index 85aad8d7..38b98c1f 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -90,7 +90,6 @@ def test_regenerate_with_valid_content_type(content_config: ContentConfig, searc
 
 
 # ----------------------------------------------------------------------------------------------------
-@pytest.mark.skip(reason="Flaky test. Search doesn't always return expected image path.")
 def test_image_search(content_config: ContentConfig, search_config: SearchConfig):
     # Arrange
     config.content_type = content_config
diff --git a/tests/test_image_search.py b/tests/test_image_search.py
index 4eb52048..80c4fdf6 100644
--- a/tests/test_image_search.py
+++ b/tests/test_image_search.py
@@ -15,7 +15,6 @@ from src.utils.rawconfig import ContentConfig, SearchConfig
 
 # Test
 # ----------------------------------------------------------------------------------------------------
-@pytest.mark.skip(reason="upstream issues in loading image search model. disabled for now")
 def test_image_search_setup(content_config: ContentConfig, search_config: SearchConfig):
     # Act
     # Regenerate image search embeddings during image setup
@@ -27,7 +26,6 @@ def test_image_search_setup(content_config: ContentConfig, search_config: Search
 
 
 # ----------------------------------------------------------------------------------------------------
-@pytest.mark.skip(reason="results inconsistent currently")
 def test_image_search(content_config: ContentConfig, search_config: SearchConfig):
     # Arrange
     output_directory = resolve_absolute_path(web_directory)