diff --git a/CHANGELOG.md b/CHANGELOG.md
index b54c551..d4c92bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This is a release introduce the Xymon server management.
 
 ##### Changes
 * README.md: Add informations for the xymon::server class.
+* Add tests.
 
 ---------------------------------------
 
diff --git a/tests/client_with_two_servers.pp b/tests/client_with_two_servers.pp
new file mode 100644
index 0000000..460a454
--- /dev/null
+++ b/tests/client_with_two_servers.pp
@@ -0,0 +1,3 @@
+class { 'xymon::client':
+  list_server => [ '192.168.0.10', '10.10.10.10' ],
+}
diff --git a/tests/server_old_version.pp b/tests/server_old_version.pp
new file mode 100644
index 0000000..01b92cd
--- /dev/null
+++ b/tests/server_old_version.pp
@@ -0,0 +1,3 @@
+class { 'xymon::server':
+  new_version => '4.3.16',
+}
diff --git a/tests/server_with_separate_client.pp b/tests/server_with_separate_client.pp
new file mode 100644
index 0000000..b35a824
--- /dev/null
+++ b/tests/server_with_separate_client.pp
@@ -0,0 +1,7 @@
+class { 'xymon::server':
+  manage_client => false,
+}
+
+class { 'xymon::client':
+  list_server => [ '127.0.0.1', '192.168.0.10' ],
+}
diff --git a/tests/server_without_apache.pp b/tests/server_without_apache.pp
new file mode 100644
index 0000000..7d11c0f
--- /dev/null
+++ b/tests/server_without_apache.pp
@@ -0,0 +1,4 @@
+class { 'xymon::server':
+  manage_apache_conf  => false,
+  manage_apache_vhost => false,
+}