diff --git a/collectd_ceilometer/tests/gnocchi/test_sender.py b/collectd_ceilometer/tests/gnocchi/test_sender.py
new file mode 100644
index 0000000..50dc29d
--- /dev/null
+++ b/collectd_ceilometer/tests/gnocchi/test_sender.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2010-2011 OpenStack Foundation
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+"""Plugin tests"""
+
+import unittest
+
+from collectd_ceilometer.gnocchi import sender as gnocchi_sender
+
+
+class TestGnocchiSender(unittest.TestCase):
+    """Test the sender class."""
+    def setUp(self):
+        self.sender = gnocchi_sender.Sender()
diff --git a/collectd_ceilometer/tests/gnocchi/test_writer.py b/collectd_ceilometer/tests/gnocchi/test_writer.py
new file mode 100644
index 0000000..8d5ef1c
--- /dev/null
+++ b/collectd_ceilometer/tests/gnocchi/test_writer.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2010-2011 OpenStack Foundation
+# Copyright (c) 2017 Intel Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+"""Gnocchi Writer tests"""
+
+import mock
+import unittest
+
+from collectd_ceilometer.common.meters import MeterStorage
+from collectd_ceilometer.gnocchi import writer
+
+
+def mock_collectd(**kwargs):
+    "Returns collectd module with collecd logging hooks."
+    return mock.patch(
+        __name__ + '.' + MockedCollectd.__name__, specs=True,
+        get_dataset=mock.MagicMock(side_effect=Exception), **kwargs)
+
+
+class MockedCollectd(object):
+    "Mocked collectd module specifications."
+
+    def debug(self, record):
+        "Hook for debug messages"
+
+    def info(self, record):
+        "Hook for info messages"
+
+    def warning(self, record):
+        "Hook for warning messages"
+
+    def error(self, record):
+        "Hook for error messages"
+
+    def register_init(self, hook):
+        "Register an hook for init."
+
+    def register_config(self, hook):
+        "Register an hook for config."
+
+    def register_write(self, hook):
+        "Register an hook for write."
+
+    def register_shutdown(self, hook):
+        "Register an hook for shutdown."
+
+    def get_dataset(self, s):
+        "Gets a dataset."
+
+
+def mock_config(BATCH_SIZE=1, **kwargs):
+    "Returns collectd module with collecd logging hooks."
+    return mock.patch(
+        __name__ + '.' + MockedConfig.__name__, specs=True,
+        BATCH_SIZE=BATCH_SIZE, **kwargs)
+
+
+class MockedConfig(object):
+    "Mocked config class."
+
+    BATCH_SIZE = 1
+
+
+def mock_value(
+        host='localhost', plugin='cpu', plugin_instance='0',
+        _type='freq', type_instance=None, time=123456789, values=(1234,),
+        **kwargs):
+    """Create a mock value"""
+
+    return mock.patch(
+        __name__ + '.' + MockedValue.__name__, specs=True,
+        host=host, plugin=plugin, plugin_instance=plugin_instance, type=_type,
+        type_instance=type_instance, time=time, values=list(values), meta=None,
+        **kwargs)
+
+
+class MockedValue(object):
+    """Value used for testing"""
+
+    host = 'localhost'
+    plugin = None
+    plugin_instance = None
+    type = None
+    type_instance = None
+    time = 123456789
+    values = []
+    meta = None
+
+
+class TestGnocchiWriter(unittest.TestCase):
+    """Test the gnocchi Writer class"""
+
+    @mock_config()
+    @mock_collectd()
+    def setUp(self, collectd, config):
+        super(TestGnocchiWriter, self).setUp()
+
+        meters = MeterStorage(collectd=collectd)
+        self.writer = writer.Writer(meters=meters, config=config)