diff --git a/Makefile b/Makefile
index b5411b11..b46b5d26 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ run: all
 	WIREPLUMBER_CONFIG_FILE=src/wireplumber.conf \
 	$(DBG) ./build/src/wireplumber
 
+test: all
+	ninja -C build test
+
 gdb:
 	$(MAKE) run DBG=gdb
 
diff --git a/meson.build b/meson.build
index 8bb44121..78365d41 100644
--- a/meson.build
+++ b/meson.build
@@ -35,3 +35,4 @@ wp_lib_include_dir = include_directories('lib')
 subdir('lib')
 subdir('modules')
 subdir('src')
+subdir('tests')
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 00000000..9b384426
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,11 @@
+common_deps = [gobject_dep, gio_dep, wp_dep, pipewire_dep]
+common_env = [
+  'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
+  'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+]
+
+test(
+  'test-properties',
+  executable('test-properties', 'properties.c', dependencies: common_deps),
+  env: common_env,
+)
diff --git a/tests/properties.c b/tests/properties.c
new file mode 100644
index 00000000..1ec6dde9
--- /dev/null
+++ b/tests/properties.c
@@ -0,0 +1,159 @@
+/* WirePlumber
+ *
+ * Copyright © 2019 Collabora Ltd.
+ *    @author George Kiagiadakis <george.kiagiadakis@collabora.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <wp/wp.h>
+#include <pipewire/pipewire.h>
+
+static void
+test_properties_basic (void)
+{
+  g_autoptr (WpProperties) p = NULL;
+
+  p = wp_properties_new_empty ();
+  g_assert_nonnull (p);
+
+  g_assert_cmpint (wp_properties_set (p, "foo.bar", "test-value"), ==, 1);
+  g_assert_cmpstr (wp_properties_get (p, "foo.bar"), ==, "test-value");
+  g_assert_cmpstr (wp_properties_get (p, "nonexistent"), ==, NULL);
+
+  /* remove the key */
+  g_assert_cmpint (wp_properties_set (p, "foo.bar", NULL), ==, 1);
+  g_assert_cmpstr (wp_properties_get (p, "foo.bar"), ==, NULL);
+  /* now returns 0 because it does not exist */
+  g_assert_cmpint (wp_properties_set (p, "foo.bar", NULL), ==, 0);
+
+  g_assert_true (wp_properties_ref (p) == p);
+  wp_properties_unref (p);
+}
+
+static void
+test_properties_wrap_dict (void)
+{
+  g_autoptr (WpProperties) p = NULL;
+  const struct spa_dict_item dict_items[] = {
+    { "key1", "value1" },
+    { "key2", "value2" },
+  };
+  const struct spa_dict dict = SPA_DICT_INIT_ARRAY(dict_items);
+
+  p = wp_properties_new_wrap_dict (&dict);
+  g_assert_nonnull (p);
+
+  g_assert_cmpstr (wp_properties_get (p, "key1"), ==, "value1");
+  g_assert_cmpstr (wp_properties_get (p, "key2"), ==, "value2");
+  g_assert_cmpstr (wp_properties_get (p, "key3"), ==, NULL);
+
+  g_assert_true (wp_properties_peek_dict (p) == &dict);
+}
+
+static void
+test_properties_copy_dict (void)
+{
+  g_autoptr (WpProperties) p = NULL;
+  const struct spa_dict_item dict_items[] = {
+    { "key1", "value1" },
+    { "key2", "value2" },
+  };
+  const struct spa_dict dict = SPA_DICT_INIT_ARRAY(dict_items);
+
+  p = wp_properties_new_copy_dict (&dict);
+  g_assert_nonnull (p);
+
+  g_assert_cmpstr (wp_properties_get (p, "key1"), ==, "value1");
+  g_assert_cmpstr (wp_properties_get (p, "key2"), ==, "value2");
+  g_assert_cmpstr (wp_properties_get (p, "key3"), ==, NULL);
+
+  g_assert_true (wp_properties_peek_dict (p) != &dict);
+}
+
+static void
+test_properties_wrap (void)
+{
+  g_autoptr (WpProperties) p = NULL;
+  struct pw_properties *props;
+
+  props = pw_properties_new ("key1", "value1", NULL);
+  g_assert_nonnull (props);
+  p = wp_properties_new_wrap (props);
+  g_assert_nonnull (p);
+
+  g_assert_true (wp_properties_peek_dict (p) == &props->dict);
+  g_assert_cmpstr (wp_properties_get (p, "key1"), ==, "value1");
+
+  /* value changes should be reflected on both objects */
+  g_assert_cmpint (wp_properties_setf (p, "foobar", "%d", 2), ==, 1);
+  g_assert_cmpstr (pw_properties_get (props, "foobar"), ==, "2");
+
+  g_assert_cmpint (pw_properties_setf (props, "test", "some-%s", "value"), ==, 1);
+  g_assert_cmpstr (wp_properties_get (p, "test"), ==, "some-value");
+
+  wp_properties_unref (g_steal_pointer (&p));
+  /* because wrap does not free the original object, this should not crash */
+  pw_properties_free (props);
+}
+
+static void
+test_properties_take (void)
+{
+  g_autoptr (WpProperties) p = NULL;
+  struct pw_properties *props;
+
+  props = pw_properties_new ("key1", "value1", NULL);
+  g_assert_nonnull (props);
+  p = wp_properties_new_take (props);
+  g_assert_nonnull (p);
+
+  g_assert_true (wp_properties_peek_dict (p) == &props->dict);
+  g_assert_cmpstr (wp_properties_get (p, "key1"), ==, "value1");
+
+  /* value changes should be reflected on both objects */
+  g_assert_cmpint (wp_properties_setf (p, "foobar", "%d", 2), ==, 1);
+  g_assert_cmpstr (pw_properties_get (props, "foobar"), ==, "2");
+
+  g_assert_cmpint (pw_properties_setf (props, "test", "some-%s", "value"), ==, 1);
+  g_assert_cmpstr (wp_properties_get (p, "test"), ==, "some-value");
+
+  /* no leaks because p frees props */
+}
+
+static void
+test_properties_to_pw_props (void)
+{
+  g_autoptr (WpProperties) p = NULL;
+  struct pw_properties *props;
+
+  p = wp_properties_new ("key1", "value1", NULL);
+  g_assert_nonnull (p);
+  g_assert_cmpstr (wp_properties_get (p, "key1"), ==, "value1");
+
+  props = wp_properties_to_pw_properties (p);
+  g_assert_nonnull (props);
+  g_assert_cmpstr (pw_properties_get (props, "key1"), ==, "value1");
+
+  /* we have different underlying objects */
+  g_assert_true (wp_properties_peek_dict (p) != &props->dict);
+  g_assert_cmpint (pw_properties_set (props, "test", "some-value"), ==, 1);
+  g_assert_cmpstr (wp_properties_get (p, "test"), ==, NULL);
+
+  pw_properties_free (props);
+}
+
+int
+main (int argc, char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  g_test_add_func ("/wp/properties/basic", test_properties_basic);
+  g_test_add_func ("/wp/properties/wrap_dict", test_properties_wrap_dict);
+  g_test_add_func ("/wp/properties/copy_dict", test_properties_copy_dict);
+  g_test_add_func ("/wp/properties/wrap", test_properties_wrap);
+  g_test_add_func ("/wp/properties/take", test_properties_take);
+  g_test_add_func ("/wp/properties/to_pw_props", test_properties_to_pw_props);
+
+  return g_test_run ();
+}