diff --git a/.flake8 b/.flake8
index 646a13d5..19307cfd 100644
--- a/.flake8
+++ b/.flake8
@@ -2,4 +2,4 @@
 max-line-length = 120
 # E203,E221,E231 conflict with black formatting
 extend-ignore = E203,E221,E231,E702,F824
-extend-exclude = .venv,venv
+extend-exclude = .venv,venv,build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 36033b91..57e3f171 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -524,17 +524,9 @@ jobs:
         run: |
           Write-Host "Installing Podman on Windows..."
 
-          # Download and install Podman
-          $podmanVersion = "5.7.0"
-          $installerUrl = "https://github.com/containers/podman/releases/download/v$podmanVersion/podman-$podmanVersion-setup.exe"
-          $installerPath = "$env:TEMP\podman-setup.exe"
-
-          Write-Host "Downloading Podman v$podmanVersion..."
-          Invoke-WebRequest -Uri $installerUrl -OutFile $installerPath
-
-          Write-Host "Installing Podman..."
-          Start-Process -FilePath $installerPath -ArgumentList "/install", "/quiet", "/norestart" -Wait -NoNewWindow
+          winget install --accept-source-agreements --silent --disable-interactivity --exact --id RedHat.Podman
 
+          # TODO: remove when this just works https://github.com/microsoft/winget-cli/issues/549
           # Add Podman to PATH for current session
           $podmanPath = "$env:ProgramFiles" + "\RedHat\Podman"
           $env:PATH = "$podmanPath;$env:PATH"
@@ -573,6 +565,21 @@ jobs:
           Write-Host "Podman info:"
           podman info
 
+      - name: Install OpenSSL
+        shell: pwsh
+        run: |
+          winget install --accept-source-agreements --silent --disable-interactivity --exact --id ShiningLight.OpenSSL.Light
+
+          # Add OpenSSL to PATH for current session
+          $opensslPath = "$env:ProgramFiles" + "\OpenSSL-Win64\bin"
+          $env:PATH = "$opensslPath;$env:PATH"
+          [Environment]::SetEnvironmentVariable("PATH", $env:PATH, [EnvironmentVariableTarget]::Process)
+
+          # Update PATH for future steps
+          Add-Content -Path $env:GITHUB_PATH -Value "$opensslPath"
+
+          openssl version
+
       - name: Run E2E tests
         shell: pwsh
         env:
diff --git a/pyproject.toml b/pyproject.toml
index e40b9362..8ec23dfa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -58,6 +58,7 @@ text = "MIT"
 dev = [
     # "pytest>=7.0",
     "argcomplete~=3.0",
+    "bcrypt",
     "black~=25.0",
     "codespell~=2.0",
     "flake8~=7.0",
@@ -69,7 +70,7 @@ dev = [
     "mypy",
     "types-PyYAML",
     "types-jsonschema",
-    "tox"
+    "tox",
 ]
 
 cov = [
diff --git a/ramalama/common.py b/ramalama/common.py
index 07a4e562..7b040e31 100644
--- a/ramalama/common.py
+++ b/ramalama/common.py
@@ -722,7 +722,7 @@ def accel_image(config: Config, images: RamalamaImageConfig | None = None, conf_
         try:
             image = select_cuda_image(config)
         except NotImplementedError as e:
-            logger.warn(f"{e}: Falling back to default image.")
+            logger.warning(f"{e}: Falling back to default image.")
             image = config.default_image
 
     vers = minor_release()
diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py
index 91915d4f..7cba1648 100644
--- a/test/e2e/conftest.py
+++ b/test/e2e/conftest.py
@@ -9,6 +9,7 @@ from pathlib import Path
 from tempfile import TemporaryDirectory
 from test.conftest import ramalama_container_engine
 
+import bcrypt
 import pytest
 
 
@@ -55,11 +56,9 @@ def container_registry():
         shutil.copy(work_dir / "domain.crt", trusted_certs_dir)
 
         # Create htpasswd file
-        subprocess.run(
-            f"htpasswd -Bbn {registry_username} {registry_password} > {htpasswd_file.as_posix()}",
-            shell=True,
-            check=True,
-        )
+        with open(htpasswd_file, "w") as pwfile:
+            passwd_hash = bcrypt.hashpw(registry_password.encode("utf-8"), bcrypt.gensalt()).decode("utf-8")
+            pwfile.write(f"{registry_username}:{passwd_hash}")
 
         # Start the registry
         subprocess.run(
diff --git a/test/e2e/test_list.py b/test/e2e/test_list.py
index c63f2663..8d7fd968 100644
--- a/test/e2e/test_list.py
+++ b/test/e2e/test_list.py
@@ -1,7 +1,6 @@
 import json
 import re
 from datetime import datetime
-from test.conftest import xfail_if_windows
 from test.e2e.utils import RamalamaExecWorkspace
 
 import pytest
@@ -60,7 +59,6 @@ def test_json_output(shared_ctx):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: Exception: Failed to remove the following models: ollama\library\smollm://:135m
 def test_all_images_removed(shared_ctx):
     shared_ctx.check_call(["ramalama", "rm", "-a"])
     result = shared_ctx.check_output(["ramalama", "list", "--noheading"])
diff --git a/test/e2e/test_rm.py b/test/e2e/test_rm.py
index 4b0efdc4..3ae8b9b1 100644
--- a/test/e2e/test_rm.py
+++ b/test/e2e/test_rm.py
@@ -1,14 +1,12 @@
 import random
 import re
 from subprocess import STDOUT, CalledProcessError
-from test.conftest import xfail_if_windows
 from test.e2e.utils import check_output
 
 import pytest
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 def test_delete_non_existing_image():
     image_name = f"rm_random_image_{random.randint(0, 9999)}"
     with pytest.raises(CalledProcessError) as exc_info:
@@ -16,7 +14,7 @@ def test_delete_non_existing_image():
 
     assert exc_info.value.returncode == 22
     assert re.match(
-        f"Error: Model '{image_name}' not found\n",
+        f"Error: Model '{image_name}' not found",
         exc_info.value.output.decode("utf-8"),
     )
 
diff --git a/test/e2e/test_run.py b/test/e2e/test_run.py
index 9f457e7b..09632d8c 100644
--- a/test/e2e/test_run.py
+++ b/test/e2e/test_run.py
@@ -1,14 +1,13 @@
 import json
 import platform
 import re
-from subprocess import STDOUT, CalledProcessError
+from subprocess import PIPE, STDOUT, CalledProcessError
 from test.conftest import (
     skip_if_container,
     skip_if_darwin,
     skip_if_docker,
     skip_if_gh_actions_darwin,
     skip_if_no_container,
-    xfail_if_windows,
 )
 from test.e2e.utils import RamalamaExecWorkspace, check_output
 
@@ -38,177 +37,175 @@ def shared_ctx_with_models(test_model):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @skip_if_no_container
 def test_basic_dry_run():
     ramalama_info = json.loads(check_output(["ramalama", "info"]))
     conman = ramalama_info["Engine"]["Name"]
 
-    result = check_output(["ramalama", "-q", "--dryrun", "run", TEST_MODEL])
+    result = check_output(["ramalama", "-q", "--dryrun", "run", TEST_MODEL], stdin=PIPE)
     assert not result.startswith(f"{conman} run --rm")
     assert not re.search(r".*-t -i", result), "run without terminal"
 
-    result = check_output(["ramalama", "-q", "--dryrun", "run", TEST_MODEL, "what's up doc?"])
+    result = check_output(["ramalama", "-q", "--dryrun", "run", TEST_MODEL, "what's up doc?"], stdin=PIPE)
     assert result.startswith(f"{conman} run")
     assert not re.search(r".*-t -i", result), "run without terminal"
 
-    result = check_output(f'echo "Test" | ramalama -q --dryrun run {TEST_MODEL}', shell=True)
+    result = check_output(f'echo "Test" | ramalama -q --dryrun run {TEST_MODEL}', shell=True, stdin=PIPE)
     assert result.startswith(f"{conman} run")
     assert not re.search(r".*-t -i", result), "run without terminal"
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @pytest.mark.parametrize(
-    "extra_params, pattern, config, env_vars, expected",
+    "extra_params, pattern, config, env_vars, expected, stdin",
     [
         # fmt: off
         pytest.param(
-            [], f".*{TEST_MODEL_FULL_NAME}.*", None, None, True,
+            [], f".*{TEST_MODEL_FULL_NAME}.*", None, None, True, None,
             id="check test_model", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*--cache-reuse 256", None, None, True,
+            [], r".*--cache-reuse 256", None, None, True, None,
             id="check cache-reuse is being set", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*--ctx-size", None, None, False,
+            [], r".*--ctx-size", None, None, False, None,
             id="check ctx-size is not show by default", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*--seed", None, None, False,
+            [], r".*--seed", None, None, False, None,
             id="check --seed is not set by default", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*-t -i", None, None, False,
+            [], r".*-t -i",None, None, False, PIPE,
             id="check -t -i is not present without tty", marks=skip_if_no_container)
         ,
         pytest.param(
             ["--env", "a=b", "--env", "test=success", "--name", "foobar"],
-            r"--env a=b --env test=success", None, None, True,
+            r"--env a=b --env test=success", None, None, True, None,
             id="check --env", marks=skip_if_no_container,
         ),
         pytest.param(
-            ["--oci-runtime", "foobar"], r"--runtime foobar", None, None, True,
+            ["--oci-runtime", "foobar"], r"--runtime foobar", None, None, True, None,
             id="check --oci-runtime", marks=skip_if_no_container)
         ,
         pytest.param(
             ["--net", "bridge", "--name", "foobar"], r".*--network bridge",
-            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True,
+            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True, None,
             id="check --net=bridge with RAMALAMA_CONFIG=/dev/null", marks=skip_if_no_container,
         ),
         pytest.param(
             ["--name", "foobar"], f".*{TEST_MODEL_FULL_NAME}.*",
-            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True,
+            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True, None,
             id="check test_model with RAMALAMA_CONFIG=/dev/null", marks=skip_if_no_container,
         ),
         pytest.param(
             ["-c", "4096", "--name", "foobar"], r".*--ctx-size 4096",
-            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True,
+            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True, None,
             id="check --ctx-size 4096 with RAMALAMA_CONFIG=/dev/null",  marks=skip_if_no_container,
         ),
         pytest.param(
             ["--cache-reuse", "512", "--name", "foobar"], r".*--cache-reuse 512", None,
-            {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True,
+            {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True, None,
             id="check --cache-reuse with RAMALAMA_CONFIG=/dev/null", marks=skip_if_no_container,
         ),
         pytest.param(
             ["--name", "foobar"], r".*--temp 0.8", None, {
                 "RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'
-            }, True,
+            }, True, None,
             id="check --temp default value is 0.8 with RAMALAMA_CONFIG=/dev/null", marks=skip_if_no_container,
         ),
         pytest.param(
             ["--seed", "9876", "--name", "foobar"], r".*--seed 9876",
-            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True,
+            None, {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True, None,
             id="check --seed 9876 with RAMALAMA_CONFIG=/dev/null", marks=skip_if_no_container,
         ),
         pytest.param(
             ["--name", "foobar"], r".*--pull newer", None,
-            {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True,
+            {"RAMALAMA_CONFIG": "NUL" if platform.system() == "Windows" else '/dev/null'}, True, None,
             id="check pull policy with RAMALAMA_CONFIG=/dev/null", marks=[skip_if_no_container, skip_if_docker],
         ),
         pytest.param(
-            [], DEFAULT_PULL_PATTERN, None, None, True,
+            [], DEFAULT_PULL_PATTERN, None, None, True, None,
             id="check default pull policy",
             marks=[skip_if_no_container],
         ),
         pytest.param(
-            ["--pull", "never", "-c", "4096", "--name", "foobbar"], r".*--pull never", None, None, True,
+            ["--pull", "never", "-c", "4096", "--name", "foobbar"], r".*--pull never", None, None, True, None,
             id="check never pull policy", marks=skip_if_no_container,
         ),
         pytest.param(
-            [], r".*--pull never", CONFIG_WITH_PULL_NEVER, None, True,
+            [], r".*--pull never", CONFIG_WITH_PULL_NEVER, None, True, None,
             id="check pull policy with RAMALAMA_CONFIG", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--name", "foobar"], r".*--name foobar", None, None, True,
+            ["--name", "foobar"], r".*--name foobar", None, None, True, None,
             id="check --name foobar", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--name", "foobar"], r".*--cap-drop=all", None, None, True,
+            ["--name", "foobar"], r".*--cap-drop=all", None, None, True, None,
             id="check if --cap-drop=all is present", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--name", "foobar"], r".*no-new-privileges", None, None, True,
+            ["--name", "foobar"], r".*no-new-privileges", None, None, True, None,
             id="check if --no-new-privs is present", marks=skip_if_no_container),
         pytest.param(
-            ["--selinux", "True"], r".*--security-opt=label=disable", None, None, False,
+            ["--selinux", "True"], r".*--security-opt=label=disable", None, None, False, None,
             id="check --selinux=True enables container separation", marks=skip_if_no_container),
         pytest.param(
-            ["--selinux", "False"], r".*--security-opt=label=disable", None, None, True,
+            ["--selinux", "False"], r".*--security-opt=label=disable", None, None, True, None,
             id="check --selinux=False disables container separation", marks=skip_if_no_container),
         pytest.param(
-            ["--runtime-args", "--foo -bar"], r".*--foo\s+-bar", None, None, True,
+            ["--runtime-args", "--foo -bar"], r".*--foo\s+-bar", None, None, True, None,
             id="check --runtime-args", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--runtime-args", "--foo='a b c'"], r".*--foo=a b c", None, None, True,
+            ["--runtime-args", "--foo='a b c'"], r".*--foo=a b c", None, None, True, None,
             id="check --runtime-args=\"--foo='a b c'\"", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--privileged"], r".*--privileged", None, None, True,
+            ["--privileged"], r".*--privileged", None, None, True, None,
             id="check --privileged", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--privileged"], r".*--cap-drop=all", None, None, False,
+            ["--privileged"], r".*--cap-drop=all", None, None, False, None,
             id="check cap-drop=all is not set when --privileged", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--privileged"], r".*no-new-privileges", None, None, False,
+            ["--privileged"], r".*no-new-privileges", None, None, False, None,
             id="check no-new-privileges is not set when --privileged", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*foo:latest.*serve", None, {"RAMALAMA_IMAGE": "foo:latest"}, True,
+            [], r".*foo:latest.*serve", None, {"RAMALAMA_IMAGE": "foo:latest"}, True, None,
             id="check run with RAMALAMA_IMAGE=foo:latest", marks=skip_if_no_container
         ),
         pytest.param(
-            ["--ctx-size", "4096"], r".*serve.*--ctx-size 4096", None, None, True,
+            ["--ctx-size", "4096"], r".*serve.*--ctx-size 4096", None, None, True, None,
             id="check --ctx-size 4096", marks=skip_if_container,
         ),
         pytest.param(
-            ["--ctx-size", "4096"], r".*--cache-reuse 256.*", None, None, True,
+            ["--ctx-size", "4096"], r".*--cache-reuse 256.*", None, None, True, None,
             id="check --cache-reuse is set by default to 256", marks=skip_if_container,
         ),
         pytest.param(
-            [], r".*-e ASAHI_VISIBLE_DEVICES=99", None, {"ASAHI_VISIBLE_DEVICES": "99"}, True,
+            [], r".*-e ASAHI_VISIBLE_DEVICES=99", None, {"ASAHI_VISIBLE_DEVICES": "99"}, True, None,
             id="check ASAHI_VISIBLE_DEVICES env var", marks=skip_if_no_container,
         ),
         pytest.param(
-            [], r".*-e CUDA_LAUNCH_BLOCKING=1", None, {"CUDA_LAUNCH_BLOCKING": "1"}, True,
+            [], r".*-e CUDA_LAUNCH_BLOCKING=1", None, {"CUDA_LAUNCH_BLOCKING": "1"}, True, None,
             id="check CUDA_LAUNCH_BLOCKING env var", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*-e HIP_VISIBLE_DEVICES=99", None, {"HIP_VISIBLE_DEVICES": "99"}, True,
+            [], r".*-e HIP_VISIBLE_DEVICES=99", None, {"HIP_VISIBLE_DEVICES": "99"}, True, None,
             id="check HIP_VISIBLE_DEVICES env var", marks=skip_if_no_container
         ),
         pytest.param(
-            [], r".*-e HSA_OVERRIDE_GFX_VERSION=0.0.0", None, {"HSA_OVERRIDE_GFX_VERSION": "0.0.0"}, True,
+            [], r".*-e HSA_OVERRIDE_GFX_VERSION=0.0.0", None, {"HSA_OVERRIDE_GFX_VERSION": "0.0.0"}, True, None,
             id="check HSA_OVERRIDE_GFX_VERSION env var", marks=skip_if_no_container,
         ),
         pytest.param(
             [], r"(.*-e (HIP_VISIBLE_DEVICES=99|HSA_OVERRIDE_GFX_VERSION=0.0.0)){2}",
-            None, {"HIP_VISIBLE_DEVICES": "99", "HSA_OVERRIDE_GFX_VERSION": "0.0.0"}, True,
+            None, {"HIP_VISIBLE_DEVICES": "99", "HSA_OVERRIDE_GFX_VERSION": "0.0.0"}, True, None,
             id="check HIP_VISIBLE_DEVICES & HSA_OVERRIDE_GFX_VERSION env vars", marks=skip_if_no_container,
         ),
         pytest.param(
@@ -216,17 +213,17 @@ def test_basic_dry_run():
                 "--device", "NUL" if platform.system() == "Windows" else '/dev/null',
                 "--pull", "never"
             ],
-            r".*--device (NUL|/dev/null) .*", None, None, True,
+            r".*--device (NUL|/dev/null) .*", None, None, True, None,
             id="check --device=/dev/null", marks=skip_if_no_container),
         pytest.param(
-            ["--device", "none", "--pull", "never"], r".*--device.*", None, None, False,
+            ["--device", "none", "--pull", "never"], r".*--device.*", None, None, False, None,
             id="check --device with unsupported value", marks=skip_if_no_container),
         # fmt: on
     ],
 )
-def test_params(extra_params, pattern, config, env_vars, expected):
+def test_params(extra_params, pattern, config, env_vars, expected, stdin):
     with RamalamaExecWorkspace(config=config, env_vars=env_vars) as ctx:
-        result = ctx.check_output(RAMALAMA_DRY_RUN + extra_params + [TEST_MODEL])
+        result = ctx.check_output(RAMALAMA_DRY_RUN + extra_params + [TEST_MODEL], stdin=stdin)
         assert bool(re.search(pattern, result)) is expected
 
 
@@ -271,7 +268,6 @@ def test_params_errors(extra_params, pattern, config, env_vars, expected_exit_co
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @skip_if_darwin  # test is broken on MAC --no-container right now
 def test_run_model_with_prompt(shared_ctx_with_models, test_model):
     import platform
@@ -288,14 +284,12 @@ def test_run_model_with_prompt(shared_ctx_with_models, test_model):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 def test_run_keepalive(shared_ctx_with_models, test_model):
     ctx = shared_ctx_with_models
     ctx.check_call(["ramalama", "run", "--keepalive", "1s", test_model])
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @skip_if_no_container
 @skip_if_docker
 @skip_if_gh_actions_darwin
@@ -319,7 +313,7 @@ def test_run_keepalive(shared_ctx_with_models, test_model):
                 "tiny",
             ],
             22,
-            r".*Error: quay.io/ramalama/testrag: image not known",
+            r".*quay.io/ramalama/testrag: image not known",
             id="non-existing-image-with-rag",
         ),
     ],
@@ -333,7 +327,6 @@ def test_run_with_non_existing_images_new(shared_ctx_with_models, run_args, exit
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @skip_if_no_container
 @skip_if_darwin
 @skip_if_docker
diff --git a/test/e2e/test_serve.py b/test/e2e/test_serve.py
index 0a23ce49..e81ed7b5 100644
--- a/test/e2e/test_serve.py
+++ b/test/e2e/test_serve.py
@@ -16,7 +16,6 @@ from test.conftest import (
     skip_if_gh_actions_darwin,
     skip_if_no_container,
     skip_if_not_darwin,
-    xfail_if_windows,
 )
 from test.e2e.utils import RamalamaExecWorkspace, check_output, get_full_model_name
 
@@ -288,7 +287,6 @@ def test_full_model_name_expansion():
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: Error: no container with name or ID "serve_and_stop_dyGXy" found: no such container
 @skip_if_no_container
 def test_serve_and_stop(shared_ctx, test_model):
     ctx = shared_ctx
@@ -334,7 +332,6 @@ def test_serve_and_stop(shared_ctx, test_model):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: Container not starting?
 @skip_if_no_container
 def test_serve_multiple_models(shared_ctx, test_model):
     ctx = shared_ctx
@@ -459,7 +456,6 @@ def test_generation_with_bad_add_to_unit_flag_value(test_model):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: registry fixture currently doesn't work on windows
 @skip_if_no_container
 @pytest.mark.xfail("config.option.container_engine == 'docker'", reason="docker login does not support --tls-verify")
 def test_quadlet_and_kube_generation_with_container_registry(container_registry, is_container, test_model):
@@ -681,7 +677,6 @@ def test_kube_generation_with_llama_api(test_model):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: failing with exit code 5
 @skip_if_docker
 @skip_if_no_container
 def test_serve_api(caplog):
@@ -730,7 +725,6 @@ def test_serve_api(caplog):
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @skip_if_no_container
 @skip_if_docker
 @skip_if_gh_actions_darwin
@@ -757,11 +751,10 @@ def test_serve_with_non_existing_images():
                 stderr=STDOUT,
             )
         assert exc_info.value.returncode == 22
-        assert re.search(r"Error: quay.io/ramalama/rag: image not known.*", exc_info.value.output.decode("utf-8"))
+        assert re.search(r"quay.io/ramalama/rag: image not known.*", exc_info.value.output.decode("utf-8"))
 
 
 @pytest.mark.e2e
-@xfail_if_windows  # FIXME: AttributeError: module 'os' has no attribute 'fork'
 @skip_if_no_container
 @skip_if_darwin
 @skip_if_docker