diff --git a/lib/cmp_io.c b/lib/cmp_io.c
index f8a4883fb2d5a765ec896a16595d95d453ff01fe..a730ea922fd88eb0e93c0b7bb1655715e2125bb1 100644
--- a/lib/cmp_io.c
+++ b/lib/cmp_io.c
@@ -286,15 +286,13 @@ int write_data_to_file(const void *buf, uint32_t buf_size, const char *output_pr
 
 static void remove_spaces(char *s)
 {
-	const char *d;
+	const char *d = s;
 
 	if (!s)
 		return;
 
-	d = s;
-
 	do {
-		while (*d == ' ' || *d == '\t')
+		while (isspace(*d))
 			d++;
 	} while ((*s++ = *d++) != '\0');
 }
diff --git a/test/cmp_tool/cmp_tool_integration_test.py b/test/cmp_tool/cmp_tool_integration_test.py
index 6f16ae8b368e7fd29c08d58a47e07498308b3529..4abae437b63d61e13297618efd209b59bd709ed8 100755
--- a/test/cmp_tool/cmp_tool_integration_test.py
+++ b/test/cmp_tool/cmp_tool_integration_test.py
@@ -484,7 +484,7 @@ def test_model_compression():
             assert(returncode == EXIT_SUCCESS)
             assert(stderr == "")
             cfg = parse_key_value(stdout)
-            cfg['cmp_mode'] = 'MODE_MODEL_MULTI'
+            cfg['cmp_mode'] = 'MODE_MODEL_MULTI\r'
             cfg['model_value'] = '0'
             cfg["samples"] = '5'
             cfg["buffer_length"] = '2'