diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/FscCliTests.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/FscCliTests.fs
index c5d48ad37f2..8319b875521 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/FscCliTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/Fsc/FscCliTests.fs
@@ -34,7 +34,7 @@ module FscCliTests =
     /// Original: SOURCE="E_MissingSourceFile02.fs X:\doesnotexist.fs"
     /// Expected: //<Expects id="FS0225" status="error">Source file ['"].+['"] could not be found</Expects>
     /// CLI Test: FSC with non-existent absolute path (Windows-style)
-    [<FactForWINDOWS>]
+    [<FactForDESKTOP>]
     let ``fsc missing source file - absolute Windows path reports FS0225`` () =
         let result = runFscProcess ["X:\\doesnotexist.fs"]
         Assert.NotEqual(0, result.ExitCode)
@@ -54,7 +54,7 @@ module FscCliTests =
     /// Original: SOURCE="E_MissingSourceFile03.fs \\qwerty\y\doesnotexist.fs"
     /// Expected: //<Expects id="FS0225" status="error">Source file ['"].+['"] could not be found</Expects>
     /// CLI Test: FSC with non-existent UNC path
-    [<FactForWINDOWS>]
+    [<FactForDESKTOP>]
     let ``fsc missing source file - UNC path reports FS0225`` () =
         let result = runFscProcess ["\\\\qwerty\\y\\doesnotexist.fs"]
         Assert.NotEqual(0, result.ExitCode)
diff --git a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsi/FsiCliTests.fs b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsi/FsiCliTests.fs
index a66269e63f6..04527a9e30d 100644
--- a/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsi/FsiCliTests.fs
+++ b/tests/FSharp.Compiler.ComponentTests/CompilerOptions/fsi/FsiCliTests.fs
@@ -2,6 +2,8 @@
 
 namespace CompilerOptions.Fsi
 
+open System
+open System.IO
 open Xunit
 open FSharp.Test
 open FSharp.Test.Compiler
@@ -67,3 +69,197 @@ module FsiCliTests =
         let result = runFsiProcess [option]
         Assert.NotEqual(0, result.ExitCode)
         Assert.Contains(expectedError, result.StdErr)
+
+    // ============================================================================
+    // --quiet option tests
+    // ============================================================================
+
+    /// CLI Test: --quiet suppresses the banner
+    [<Fact>]
+    let ``fsi quiet - suppresses banner`` () =
+        let result = runFsiProcess ["--quiet"; "--exec"; "--nologo"]
+        Assert.Equal(0, result.ExitCode)
+        Assert.DoesNotContain("Microsoft (R) F# Interactive", result.StdOut)
+
+    /// In-process test: --quiet suppresses feedback output but expressions still evaluate
+    [<Fact>]
+    let ``fsi quiet - expressions evaluate correctly`` () =
+        Fsx """let x = 1 + 1"""
+        |> withOptions ["--quiet"]
+        |> runFsi
+        |> shouldSucceed
+
+    // ============================================================================
+    // --exec option tests
+    // ============================================================================
+
+    /// CLI Test: --exec causes FSI to exit after evaluating (no interactive prompt)
+    [<Fact>]
+    let ``fsi exec - exits after evaluating script`` () =
+        let tmpFile = Path.Combine(Path.GetTempPath(), $"fsi_exec_test_{Guid.NewGuid()}.fsx")
+        try
+            File.WriteAllText(tmpFile, "printfn \"hello from exec\"")
+            let result = runFsiProcess ["--exec"; "--nologo"; tmpFile]
+            Assert.Equal(0, result.ExitCode)
+            Assert.Contains("hello from exec", result.StdOut)
+        finally
+            try File.Delete(tmpFile) with _ -> ()
+
+    // ============================================================================
+    // --use option tests
+    // ============================================================================
+
+    /// CLI Test: --use:file.fsx loads and executes a script file
+    [<Fact>]
+    let ``fsi use - loads and executes script file`` () =
+        let tmpFile = Path.Combine(Path.GetTempPath(), $"fsi_use_test_{Guid.NewGuid()}.fsx")
+        try
+            File.WriteAllText(tmpFile, "printfn \"loaded via use\"")
+            let result = runFsiProcess ["--nologo"; "--exec"; $"--use:{tmpFile}"]
+            Assert.Equal(0, result.ExitCode)
+            Assert.Contains("loaded via use", result.StdOut)
+        finally
+            try File.Delete(tmpFile) with _ -> ()
+
+    /// CLI Test: --use with nonexistent file produces error
+    [<Fact>]
+    let ``fsi use - nonexistent file produces error`` () =
+        let result = runFsiProcess ["--exec"; "--use:nonexistent_file_xyz.fsx"]
+        Assert.NotEqual(0, result.ExitCode)
+
+    // ============================================================================
+    // --load option tests
+    // ============================================================================
+
+    /// CLI Test: --load:file.fsx loads a file (definitions available)
+    [<Fact>]
+    let ``fsi load - loads file definitions`` () =
+        let tmpFile = Path.Combine(Path.GetTempPath(), $"fsi_load_test_{Guid.NewGuid()}.fsx")
+        try
+            File.WriteAllText(tmpFile, "let loadedValue = 42")
+            let result = runFsiProcess ["--nologo"; "--exec"; $"--load:{tmpFile}"]
+            Assert.Equal(0, result.ExitCode)
+        finally
+            try File.Delete(tmpFile) with _ -> ()
+
+    /// CLI Test: --load with nonexistent file produces error
+    [<Fact>]
+    let ``fsi load - nonexistent file produces error`` () =
+        let result = runFsiProcess ["--exec"; "--load:nonexistent_file_xyz.fsx"]
+        Assert.NotEqual(0, result.ExitCode)
+
+    // ============================================================================
+    // --gui option tests (switch: +/-)
+    // ============================================================================
+
+    /// CLI Test: --gui- is accepted without error
+    [<Fact>]
+    let ``fsi gui - gui minus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--gui-"]
+        |> runFsi
+        |> shouldSucceed
+
+    /// CLI Test: --gui+ is accepted without error
+    [<Fact>]
+    let ``fsi gui - gui plus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--gui+"]
+        |> runFsi
+        |> shouldSucceed
+
+    // ============================================================================
+    // --readline option tests (switch: +/-)
+    // ============================================================================
+
+    /// CLI Test: --readline- is accepted without error
+    [<Fact>]
+    let ``fsi readline - readline minus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--readline-"]
+        |> runFsi
+        |> shouldSucceed
+
+    /// CLI Test: --readline+ is accepted without error
+    [<Fact>]
+    let ``fsi readline - readline plus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--readline+"]
+        |> runFsi
+        |> shouldSucceed
+
+    // ============================================================================
+    // --quotations-debug option tests (switch: +/-)
+    // ============================================================================
+
+    /// CLI Test: --quotations-debug+ is accepted without error
+    [<Fact>]
+    let ``fsi quotations-debug - plus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--quotations-debug+"]
+        |> runFsi
+        |> shouldSucceed
+
+    /// CLI Test: --quotations-debug- is accepted without error
+    [<Fact>]
+    let ``fsi quotations-debug - minus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--quotations-debug-"]
+        |> runFsi
+        |> shouldSucceed
+
+    // ============================================================================
+    // --shadowcopyreferences option tests (switch: +/-)
+    // ============================================================================
+
+    /// CLI Test: --shadowcopyreferences+ is accepted without error
+    [<Fact>]
+    let ``fsi shadowcopyreferences - plus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--shadowcopyreferences+"]
+        |> runFsi
+        |> shouldSucceed
+
+    /// CLI Test: --shadowcopyreferences- is accepted without error
+    [<Fact>]
+    let ``fsi shadowcopyreferences - minus accepted`` () =
+        Fsx """1+1"""
+        |> withOptions ["--shadowcopyreferences-"]
+        |> runFsi
+        |> shouldSucceed
+
+    // ============================================================================
+    // --nologo option tests
+    // ============================================================================
+
+    /// CLI Test: --nologo suppresses the banner
+    [<Fact>]
+    let ``fsi nologo - suppresses banner in subprocess`` () =
+        let result = runFsiProcess ["--nologo"; "--exec"]
+        Assert.Equal(0, result.ExitCode)
+        Assert.DoesNotContain("Microsoft (R) F# Interactive", result.StdOut)
+
+    /// In-process test: FSI without --nologo shows the banner
+    [<Fact>]
+    let ``fsi nologo - without nologo shows banner`` () =
+        Fsx """1+1"""
+        |> runFsi
+        |> shouldSucceed
+        |> withStdOutContains "Microsoft"
+
+    // ============================================================================
+    // Additional error case tests
+    // ============================================================================
+
+    /// CLI Test: completely unknown option produces FS0243
+    [<Fact>]
+    let ``fsi error - unknown option produces FS0243`` () =
+        let result = runFsiProcess ["--not-a-real-option"]
+        Assert.NotEqual(0, result.ExitCode)
+        Assert.Contains("Unrecognized option: '--not-a-real-option'", result.StdErr)
+
+    /// CLI Test: --warn with invalid level produces error
+    [<Fact>]
+    let ``fsi error - invalid warn level produces error`` () =
+        let result = runFsiProcess ["--warn:invalid"; "--exec"]
+        Assert.NotEqual(0, result.ExitCode)
diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
index 41848cbf2f0..3bbfaf41278 100644
--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
@@ -430,6 +430,9 @@
     <Compile Include="CompilerOptions\fsi\FsiCliTests.fs" />
     <Compile Include="CompilerOptions\fsi\Nologo.fs" />
     <Compile Include="CompilerOptions\fsi\Langversion.fs" />
+    <Compile Include="CompilerOptions\fsc\FscCliTests.fs" />
+    <Compile Include="CompilerOptions\fsi\FsiCliTests.fs" />
+    <Compile Include="CompilerOptions\CliProcessTests.fs" />
     <Compile Include="CompilerService\RangeModule.fs" />
     <Compile Include="CompilerService\Caches.fs" />
     <Compile Include="CompilerService\LruCache.fs" />