diff --git a/test/zutil/osal/app/ffmpeg/FFmpegInputTest.java b/test/zutil/osal/app/ffmpeg/FFmpegInputTest.java
index acc3a78..7bf4d9c 100644
--- a/test/zutil/osal/app/ffmpeg/FFmpegInputTest.java
+++ b/test/zutil/osal/app/ffmpeg/FFmpegInputTest.java
@@ -34,7 +34,7 @@ public class FFmpegInputTest {
     public void onlyInput() {
         FFmpegInput ffmpegInput = new FFmpegInput("iTest.mp4");
 
-        assertEquals("-i iTest.mp4", ffmpegInput.buildCommand());
+        assertEquals("-i \"iTest.mp4\"", ffmpegInput.buildCommand());
     }
 
     @Test
@@ -51,6 +51,6 @@ public class FFmpegInputTest {
         assertEquals("-ss 9.1 -to 20.1 -t 10.1" +
                 " -an" +
                 " -sn" +
-                " -i iTest.mp4", ffmpegInput.buildCommand());
+                " -i \"iTest.mp4\"", ffmpegInput.buildCommand());
     }
 }
\ No newline at end of file
diff --git a/test/zutil/osal/app/ffmpeg/FFmpegOutputTest.java b/test/zutil/osal/app/ffmpeg/FFmpegOutputTest.java
index d065b18..5c35324 100644
--- a/test/zutil/osal/app/ffmpeg/FFmpegOutputTest.java
+++ b/test/zutil/osal/app/ffmpeg/FFmpegOutputTest.java
@@ -34,7 +34,7 @@ public class FFmpegOutputTest {
     public void onlyOutput() {
         FFmpegOutput ffmpegOutput = new FFmpegOutput("oTest.mp4");
 
-        assertEquals("oTest.mp4", ffmpegOutput.buildCommand());
+        assertEquals("\"oTest.mp4\"", ffmpegOutput.buildCommand());
     }
 
 
@@ -67,7 +67,7 @@ public class FFmpegOutputTest {
                     " -codec:v libx264 -frames 29.8 -filter:v scale=320:240 -b:v 300000 -qscale:v 22" +
                     " -codec:a libmp3lame -ar 48000 -ac 6 -b:a 360000 -qscale:a 23 -an" +
                     " -codec:s subrip -sn" +
-                    " oTest.mp4",
+                    " \"oTest.mp4\"",
                 ffmpegOutput.buildCommand());
     }
 
diff --git a/test/zutil/osal/app/ffmpeg/FFmpegTest.java b/test/zutil/osal/app/ffmpeg/FFmpegTest.java
index fccf1ce..5829bfc 100644
--- a/test/zutil/osal/app/ffmpeg/FFmpegTest.java
+++ b/test/zutil/osal/app/ffmpeg/FFmpegTest.java
@@ -38,7 +38,7 @@ public class FFmpegTest {
         ffmpeg.addInput(new FFmpegInput("iTest.mp4"));
         ffmpeg.addOutput(new FFmpegOutput("oTest.mp4"));
 
-        assertEquals("ffmpeg -i iTest.mp4 oTest.mp4", ffmpeg.buildCommand());
+        assertEquals("ffmpeg -i \"iTest.mp4\" \"oTest.mp4\"", ffmpeg.buildCommand());
     }
 
     @Test
@@ -48,7 +48,7 @@ public class FFmpegTest {
         ffmpeg.addInput(new FFmpegInput("iTest.mp4"));
         ffmpeg.addOutput(new FFmpegOutput("oTest.mp4"));
 
-        assertEquals("ffmpeg -loglevel error -i iTest.mp4 oTest.mp4", ffmpeg.buildCommand());
+        assertEquals("ffmpeg -loglevel error -i \"iTest.mp4\" \"oTest.mp4\"", ffmpeg.buildCommand());
     }
 
     @Test
@@ -58,6 +58,6 @@ public class FFmpegTest {
         ffmpeg.addInput(new FFmpegInput("iTest.mp4"));
         ffmpeg.addOutput(new FFmpegOutput("oTest.mp4"));
 
-        assertEquals("ffmpeg -y -i iTest.mp4 oTest.mp4", ffmpeg.buildCommand());
+        assertEquals("ffmpeg -y -i \"iTest.mp4\" \"oTest.mp4\"", ffmpeg.buildCommand());
     }
 }
\ No newline at end of file