diff --git a/python-api/gstswitch/server.py b/python-api/gstswitch/server.py
index 2c30fe6..6cf6d3a 100644
--- a/python-api/gstswitch/server.py
+++ b/python-api/gstswitch/server.py
@@ -40,7 +40,7 @@ def __init__(
             video_port=3000,
             audio_port=4000,
             control_port=5000,
-            record_file='record-%Y-%m-%d %H%M%S.data'):
+            record_file='record-%Y-%m-%d_%H%M%S.data'):
 
         super(Server, self).__init__()
 
diff --git a/python-api/tests/integrationtests/test_controller.py b/python-api/tests/integrationtests/test_controller.py
index e6bf0d5..64fe36b 100644
--- a/python-api/tests/integrationtests/test_controller.py
+++ b/python-api/tests/integrationtests/test_controller.py
@@ -382,7 +382,7 @@ def new_record(self):
     def test_new_record(self):
         """Test new_record"""
         for _ in range(self.NUM):
-            serv = Server(path=PATH, record_file="test-%Y-%m-%d %H%M%S.data")
+            serv = Server(path=PATH, record_file="test-%Y-%m-%d_%H%M%S.data")
             try:
                 serv.run()
 
@@ -392,8 +392,8 @@ def test_new_record(self):
 
                 curr_time = datetime.datetime.now()
                 alt_curr_time = curr_time + datetime.timedelta(0, 1)
-                time_str = curr_time.strftime('%Y-%m-%d %H%M%S')
-                alt_time_str = alt_curr_time.strftime('%Y-%m-%d %H%M%S')
+                time_str = curr_time.strftime('%Y-%m-%d_%H%M%S')
+                alt_time_str = alt_curr_time.strftime('%Y-%m-%d_%H%M%S')
                 test_filename = "test-{0}.data".format(time_str)
                 alt_test_filename = "test-{0}.data".format(alt_time_str)
 
diff --git a/python-api/tests/unittests/test_server_unit.py b/python-api/tests/unittests/test_server_unit.py
index f98fd14..0892ef9 100644
--- a/python-api/tests/unittests/test_server_unit.py
+++ b/python-api/tests/unittests/test_server_unit.py
@@ -29,7 +29,7 @@ def mock_method(arg):
         serv._start_process = mock_method
         assert serv._run_process().split() == "/usr/gst-switch-srv \
 --video-input-port=3000 --audio-input-port=4000 \
---control-port=5000 --record=record-%Y-%m-%d %H%M%S.data".split()
+--control-port=5000 --record=record-%Y-%m-%d_%H%M%S.data".split()
 
     def test_path_provided_no_slash(self):
         """Test if a path is provided"""
@@ -41,7 +41,7 @@ def mock_method(arg):
         serv._start_process = mock_method
         assert serv._run_process().split() == "/usr/gst-switch-srv \
 --video-input-port=3000 --audio-input-port=4000 \
---control-port=5000 --record=record-%Y-%m-%d %H%M%S.data".split()
+--control-port=5000 --record=record-%Y-%m-%d_%H%M%S.data".split()
 
     def test_path_empty(self, monkeypatch):
         """Test if null path is given"""
@@ -60,7 +60,7 @@ def mockreturn(path):
             serv._start_process = mock_method
             assert serv._run_process().split() == "/usr/gst-switch-srv \
 --video-input-port=3000 --audio-input-port=4000 \
---control-port=5000 --record=record-%Y-%m-%d %H%M%S.data".split()
+--control-port=5000 --record=record-%Y-%m-%d_%H%M%S.data".split()
 
 
 class TestVideoPort(object):