Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_add.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_add.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_add.py
@@ -225,7 +225,7 @@ class TestAddCommand(unittest.TestCase):
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '--source', 'scm',
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_config.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_config.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_config.py
@@ -104,7 +104,7 @@ class TestInitConfig(unittest.TestCase):
     def test_config_is_not_overwritten(self):
         """Check whether an existing config file is not replaced"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         with runner.isolated_filesystem() as fs:
             shutil.copy(MOCK_CONFIG_FILEPATH, fs)
@@ -132,7 +132,7 @@ class TestInitConfig(unittest.TestCase):
     def test_overwrite_config(self):
         """Check whether an existing config file is overwritten"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         with runner.isolated_filesystem() as fs:
             shutil.copy(MOCK_CONFIG_FILEPATH, fs)
@@ -240,7 +240,7 @@ class TestSetConfig(unittest.TestCase):
     def test_not_available_keys(self):
         """Check if it raises an error when the key is not available"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         with runner.isolated_filesystem() as fs:
             shutil.copy(MOCK_CONFIG_FILEPATH, fs)
@@ -260,7 +260,7 @@ class TestSetConfig(unittest.TestCase):
     def test_invalid_keys(self):
         """Check if it raises an error when the key is invalid"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         # Test keys that do not follow '<section>.<option>' schema
         with runner.isolated_filesystem() as fs:
@@ -321,7 +321,7 @@ class TestSetConfig(unittest.TestCase):
     def test_invalid_config_files(self):
         """Check whether it raises and error reading invalid configuration files"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         # Test keys that do not follow '<section>.<option>' schema
         with runner.isolated_filesystem() as fs:
@@ -405,7 +405,7 @@ class TestGetConfig(unittest.TestCase):
     def test_not_available_keys(self):
         """Check if it raises an error when the key is not available"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         with runner.isolated_filesystem() as fs:
             shutil.copy(MOCK_CONFIG_FILEPATH, fs)
@@ -424,7 +424,7 @@ class TestGetConfig(unittest.TestCase):
     def test_invalid_keys(self):
         """Check if it raises an error when the key is invalid"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         # Test keys that do not follow '<section>.<option>' schema
         with runner.isolated_filesystem() as fs:
@@ -480,7 +480,7 @@ class TestGetConfig(unittest.TestCase):
     def test_invalid_config_files(self):
         """Check whether it raises and error reading invalid configuration files"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         with runner.isolated_filesystem() as fs:
             filepath = os.path.join(fs, 'unknown_file.cfg')
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_countries.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_countries.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_countries.py
@@ -193,7 +193,7 @@ class TestCountriesCommand(unittest.Test
     def test_countries_invalid_code(self):
         """Check if it fails when code is invalid"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = ['--code', 'E']
         result = runner.invoke(countries, params)
@@ -263,7 +263,7 @@ class TestCountriesCommand(unittest.Test
     def test_countries_invalid_term(self):
         """Check if it fails when term is invalid"""
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = ['--term', 'E']
         result = runner.invoke(countries, params)
@@ -334,7 +334,7 @@ class TestCountriesCommand(unittest.Test
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         result = runner.invoke(countries)
 
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_enroll.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_enroll.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_enroll.py
@@ -180,7 +180,7 @@ class TestEnrollCommand(unittest.TestCas
         client = MockClient([])
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',
@@ -225,7 +225,7 @@ class TestEnrollCommand(unittest.TestCas
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_lock.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_lock.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_lock.py
@@ -116,7 +116,7 @@ class TestLockAddCommand(unittest.TestCa
         ]
         mock_client = MockClient(responses)
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             'FFFFFFFFFFFFFFF'
@@ -174,7 +174,7 @@ class TestLockRmCommand(unittest.TestCas
         ]
         mock_client = MockClient(responses)
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             'FFFFFFFFFFFFFFF'
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_merge.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_merge.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_merge.py
@@ -113,7 +113,7 @@ class TestMergeCommand(unittest.TestCase
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_mv.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_mv.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_mv.py
@@ -147,7 +147,7 @@ class TestMvCommand(unittest.TestCase):
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_profile.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_profile.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_profile.py
@@ -310,7 +310,7 @@ class TestProfileCommand(unittest.TestCa
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             'FFFFFFFFFFFFFFF'
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_rm.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_rm.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_rm.py
@@ -146,7 +146,7 @@ class TestRmCommand(unittest.TestCase):
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = ['FFFFFFFFFFFFFFF']
         result = runner.invoke(rm, params, obj=mock_client)
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_show.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_show.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_show.py
@@ -431,7 +431,7 @@ class TestShowCommand(unittest.TestCase)
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         result = runner.invoke(show)
 
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_split.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_split.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_split.py
@@ -157,7 +157,7 @@ class TestSplitCommand(unittest.TestCase
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',
Index: grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_withdraw.py
===================================================================
--- grimoirelab-sortinghat-1.7.1.orig/tests/cli/test_cmd_withdraw.py
+++ grimoirelab-sortinghat-1.7.1/tests/cli/test_cmd_withdraw.py
@@ -145,7 +145,7 @@ class TestWithdrawCommand(unittest.TestC
         client = MockClient([])
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',
@@ -190,7 +190,7 @@ class TestWithdrawCommand(unittest.TestC
         client = MockClient(responses)
         mock_client.return_value = client
 
-        runner = click.testing.CliRunner(mix_stderr=False)
+        runner = click.testing.CliRunner()
 
         params = [
             '322397ed782a798ffd9d0bc7e293df4292fe075d',