diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac3584630..3ebbaecd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,6 +92,12 @@ test-regenconf:
     - cd src/yunohost
     - py.test tests/test_regenconf.py
 
+test-service:
+  extends: .test-stage
+  script:
+    - cd src/yunohost
+    - py.test tests/test_service.py
+
 ########################################
 # LINTER
 ########################################
diff --git a/src/yunohost/tests/test_service.py b/src/yunohost/tests/test_service.py
new file mode 100644
index 000000000..d8660c1e5
--- /dev/null
+++ b/src/yunohost/tests/test_service.py
@@ -0,0 +1,97 @@
+import os
+
+from conftest import message, raiseYunohostError
+
+from yunohost.service import _get_services, _save_services, service_status, service_add, service_remove
+
+
+def setup_function(function):
+
+    clean()
+
+
+def teardown_function(function):
+
+    clean()
+
+
+def clean():
+
+    # To run these tests, we assume ssh(d) service exists and is running
+    assert os.system("pgrep sshd >/dev/null") == 0
+
+    services = _get_services()
+    assert "ssh" in services
+
+    if "dummyservice" in services:
+        del services["dummyservice"]
+        _save_services(services)
+
+
+def test_service_status_all():
+
+    status = service_status()
+    assert "ssh" in status.keys()
+    assert status["ssh"]["status"] == "running"
+
+
+def test_service_status_single():
+
+    status = service_status("ssh")
+    assert "status" in status.keys()
+    assert status["status"] == "running"
+
+
+def test_service_status_unknown_service(mocker):
+
+    with raiseYunohostError(mocker, 'service_unknown'):
+        service_status(["ssh", "doesnotexists"])
+
+
+def test_service_add():
+
+    service_add("dummyservice", description="A dummy service to run tests")
+    assert "dummyservice" in service_status().keys()
+
+
+def test_service_remove():
+
+    service_add("dummyservice", description="A dummy service to run tests")
+    assert "dummyservice" in service_status().keys()
+    service_remove("dummyservice")
+    assert "dummyservice" not in service_status().keys()
+
+
+def test_service_remove_service_that_doesnt_exists(mocker):
+
+    assert "dummyservice" not in service_status().keys()
+
+    with raiseYunohostError(mocker, 'service_unknown'):
+        service_remove("dummyservice")
+
+    assert "dummyservice" not in service_status().keys()
+
+
+def test_service_update_to_add_properties():
+
+    service_add("dummyservice", description="")
+    assert not _get_services()["dummyservice"].get("test_status")
+    service_add("dummyservice", description="", test_status="true")
+    assert _get_services()["dummyservice"].get("test_status") == "true"
+
+
+def test_service_update_to_change_properties():
+
+    service_add("dummyservice", description="", test_status="false")
+    assert _get_services()["dummyservice"].get("test_status") == "false"
+    service_add("dummyservice", description="", test_status="true")
+    assert _get_services()["dummyservice"].get("test_status") == "true"
+
+
+def test_service_update_to_remove_properties():
+
+    service_add("dummyservice", description="", test_status="false")
+    assert _get_services()["dummyservice"].get("test_status") == "false"
+    service_add("dummyservice", description="", test_status="")
+    assert not _get_services()["dummyservice"].get("test_status")
+