diff --git a/tests/common/test-server.h b/tests/common/test-server.h
index 11fdd3b8a1156adf2ab12c4333aa22a40bd158a0..366db178f5cd6c8b884b398b386d0203276f1065 100644
--- a/tests/common/test-server.h
+++ b/tests/common/test-server.h
@@ -46,3 +46,20 @@ wp_test_server_teardown (WpTestServer *self)
   pw_thread_loop_destroy (self->thread_loop);
   g_free (self->name);
 }
+
+typedef void WpTestServerLocker;
+
+static inline WpTestServerLocker *
+wp_test_server_locker_new (WpTestServer * self)
+{
+  pw_thread_loop_lock (self->thread_loop);
+  return self;
+}
+
+static inline void
+wp_test_server_locker_free (WpTestServerLocker * self)
+{
+  pw_thread_loop_unlock (((WpTestServer *)self)->thread_loop);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (WpTestServerLocker, wp_test_server_locker_free)
diff --git a/tests/modules/meson.build b/tests/modules/meson.build
index e8b60d987c76b55ae8c11b00e5ac66e57f617795..e4c17b164580febd6bae4a6ccd5b26cc69df3901 100644
--- a/tests/modules/meson.build
+++ b/tests/modules/meson.build
@@ -77,3 +77,9 @@ test(
   workdir : meson.current_source_dir(),
 )
 
+test(
+  'test-si-simple-node-endpoint',
+  executable('test-si-simple-node-endpoint', 'si-simple-node-endpoint.c',
+      dependencies: common_deps, c_args: common_args),
+  env: common_env,
+)
diff --git a/tests/modules/si-simple-node-endpoint.c b/tests/modules/si-simple-node-endpoint.c
new file mode 100644
index 0000000000000000000000000000000000000000..6af043cc507480f05e4259fc5685c44269e93c11
--- /dev/null
+++ b/tests/modules/si-simple-node-endpoint.c
@@ -0,0 +1,280 @@
+/* WirePlumber
+ *
+ * Copyright © 2020 Collabora Ltd.
+ *    @author George Kiagiadakis <george.kiagiadakis@collabora.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "../common/base-test-fixture.h"
+
+typedef struct {
+  WpBaseTestFixture base;
+} TestFixture;
+
+typedef struct {
+  const gchar *factory;
+  const gchar *name;
+  const gchar *media_class;
+  const gchar *expected_media_class;
+  WpDirection expected_direction;
+} TestConfigureActivateData;
+
+static void
+test_si_simple_node_endpoint_setup (TestFixture * f, gconstpointer user_data)
+{
+  wp_base_test_fixture_setup (&f->base, 0);
+
+  /* load modules */
+  {
+    g_autoptr (WpTestServerLocker) lock =
+        wp_test_server_locker_new (&f->base.server);
+
+    g_assert_cmpint (pw_context_add_spa_lib (f->base.server.context,
+            "fake*", "test/libspa-test"), ==, 0);
+    g_assert_cmpint (pw_context_add_spa_lib (f->base.server.context,
+            "audiotestsrc", "audiotestsrc/libspa-audiotestsrc"), ==, 0);
+    g_assert_nonnull (pw_context_load_module (f->base.server.context,
+            "libpipewire-module-spa-node-factory", NULL, NULL));
+  }
+  {
+    g_autoptr (GError) error = NULL;
+    WpModule *module = wp_module_load (f->base.core, "C",
+        "libwireplumber-module-si-simple-node-endpoint", NULL, &error);
+    g_assert_no_error (error);
+    g_assert_nonnull (module);
+  }
+}
+
+static void
+test_si_simple_node_endpoint_teardown (TestFixture * f, gconstpointer user_data)
+{
+  wp_base_test_fixture_teardown (&f->base);
+}
+
+static void
+on_node_augmented (WpProxy * node, GAsyncResult * res, TestFixture * f)
+{
+  g_autoptr (GError) error = NULL;
+  gboolean augment_ret = wp_proxy_augment_finish (node, res, &error);
+  g_assert_no_error (error);
+  g_assert_true (augment_ret);
+
+  g_main_loop_quit (f->base.loop);
+}
+
+static void
+on_item_activated (WpSessionItem * item, GAsyncResult * res, TestFixture * f)
+{
+  g_autoptr (GError) error = NULL;
+  gboolean activate_ret = wp_session_item_activate_finish (item, res, &error);
+  g_assert_no_error (error);
+  g_assert_true (activate_ret);
+
+  g_main_loop_quit (f->base.loop);
+}
+
+static void
+test_si_simple_node_endpoint_configure_activate (TestFixture * f,
+    gconstpointer user_data)
+{
+  const TestConfigureActivateData *data = user_data;
+  g_autoptr (WpNode) node = NULL;
+  g_autoptr (WpSessionItem) item = NULL;
+  WpSiStream *stream;
+
+  /* create item */
+
+  item = wp_session_item_make (f->base.core, "si-simple-node-endpoint");
+  g_assert_nonnull (item);
+  g_assert_true (WP_IS_SI_ENDPOINT (item));
+  g_assert_true (WP_IS_SI_STREAM (item));
+  g_assert_true (WP_IS_SI_PORT_INFO (item));
+
+  node = wp_node_new_from_factory (f->base.core,
+      "spa-node-factory",
+      wp_properties_new (
+          "factory.name", data->factory,
+          "node.name", data->name,
+          NULL));
+  g_assert_nonnull (node);
+
+  wp_proxy_augment (WP_PROXY (node), WP_PROXY_FEATURES_STANDARD, NULL,
+      (GAsyncReadyCallback) on_node_augmented, f);
+  g_main_loop_run (f->base.loop);
+
+  /* configure */
+
+  {
+    g_auto (GVariantBuilder) b =
+        G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_VARDICT);
+    g_variant_builder_add (&b, "{sv}", "node",
+        g_variant_new_uint64 ((guint64) node));
+    if (data->media_class) {
+      g_variant_builder_add (&b, "{sv}", "media-class",
+          g_variant_new_string (data->media_class));
+    }
+    g_assert_true (
+        wp_session_item_configure (item, g_variant_builder_end (&b)));
+  }
+
+  g_assert_cmphex (wp_session_item_get_flags (item), ==,
+      WP_SI_FLAG_CONFIGURED);
+
+  {
+    g_autoptr (GVariant) v = wp_session_item_get_configuration (item);
+    guint64 node_i;
+    const gchar *str;
+    guint32 prio;
+    guchar dir;
+    g_assert_nonnull (v);
+    g_assert_true (g_variant_lookup (v, "node", "t", &node_i));
+    g_assert_cmpuint (node_i, ==, (guint64) node);
+    g_assert_true (g_variant_lookup (v, "name", "&s", &str));
+    g_assert_cmpstr (str, ==, data->name);
+    g_assert_true (g_variant_lookup (v, "media-class", "&s", &str));
+    g_assert_cmpstr (str, ==, data->expected_media_class);
+    g_assert_true (g_variant_lookup (v, "role", "&s", &str));
+    g_assert_cmpstr (str, ==, "");
+    g_assert_true (g_variant_lookup (v, "priority", "u", &prio));
+    g_assert_cmpuint (prio, ==, 0);
+    g_assert_true (g_variant_lookup (v, "direction", "y", &dir));
+    g_assert_cmpuint (dir, ==, data->expected_direction);
+  }
+
+  /* activate */
+
+  wp_session_item_activate (item, (GAsyncReadyCallback) on_item_activated, f);
+  g_main_loop_run (f->base.loop);
+
+  g_assert_cmphex (wp_session_item_get_flags (item), ==,
+      WP_SI_FLAG_CONFIGURED | WP_SI_FLAG_ACTIVE);
+  g_assert_cmphex (wp_proxy_get_features (WP_PROXY (node)), ==,
+      WP_NODE_FEATURES_STANDARD);
+
+  g_assert_cmpint (
+      wp_si_endpoint_get_n_streams (WP_SI_ENDPOINT (item)), ==, 1);
+  g_assert_nonnull (
+      stream = wp_si_endpoint_get_stream (WP_SI_ENDPOINT (item), 0));
+
+  if (data->expected_direction == WP_DIRECTION_INPUT)
+    g_assert_cmpuint (wp_node_get_n_input_ports (node, NULL), ==, 1);
+  else
+    g_assert_cmpuint (wp_node_get_n_output_ports (node, NULL), ==, 1);
+  g_assert_cmpuint (wp_node_get_n_ports (node), ==, 1);
+
+  {
+    guint32 node_id, port_id, channel;
+    g_autoptr (GVariant) v =
+        wp_si_port_info_get_ports (WP_SI_PORT_INFO (stream), NULL);
+
+    g_assert_true (g_variant_is_of_type (v, G_VARIANT_TYPE ("a(uuu)")));
+    g_assert_cmpint (g_variant_n_children (v), ==, 1);
+    g_variant_get_child (v, 0, "(uuu)", &node_id, &port_id, &channel);
+    g_assert_cmpuint (node_id, ==, wp_proxy_get_bound_id (WP_PROXY (node)));
+    g_assert_cmpuint (channel, ==, 0);
+
+    {
+      g_autoptr (WpIterator) it = wp_node_iterate_ports (node);
+      g_auto (GValue) val = G_VALUE_INIT;
+      WpProxy *port;
+
+      g_assert_true (wp_iterator_next (it, &val));
+      g_assert_nonnull (port = g_value_get_object (&val));
+      g_assert_cmpuint (port_id, ==, wp_proxy_get_bound_id (port));
+    }
+  }
+
+  /* deactivate - configuration should not be altered  */
+
+  wp_session_item_deactivate (item);
+
+  g_assert_cmphex (wp_session_item_get_flags (item), ==,
+      WP_SI_FLAG_CONFIGURED);
+  g_assert_cmphex (wp_proxy_get_features (WP_PROXY (node)), ==,
+      WP_NODE_FEATURES_STANDARD);
+
+  {
+    g_autoptr (GVariant) v = wp_session_item_get_configuration (item);
+    guint64 node_i;
+    const gchar *str;
+    guint32 prio;
+    guchar dir;
+    g_assert_nonnull (v);
+    g_assert_true (g_variant_lookup (v, "node", "t", &node_i));
+    g_assert_cmpuint (node_i, ==, (guint64) node);
+    g_assert_true (g_variant_lookup (v, "name", "&s", &str));
+    g_assert_cmpstr (str, ==, data->name);
+    g_assert_true (g_variant_lookup (v, "media-class", "&s", &str));
+    g_assert_cmpstr (str, ==, data->expected_media_class);
+    g_assert_true (g_variant_lookup (v, "role", "&s", &str));
+    g_assert_cmpstr (str, ==, "");
+    g_assert_true (g_variant_lookup (v, "priority", "u", &prio));
+    g_assert_cmpuint (prio, ==, 0);
+    g_assert_true (g_variant_lookup (v, "direction", "y", &dir));
+    g_assert_cmpuint (dir, ==, data->expected_direction);
+  }
+
+  /* reset - configuration resets */
+
+  wp_session_item_reset (item);
+  g_assert_cmphex (wp_session_item_get_flags (item), ==, 0);
+
+  {
+    g_autoptr (GVariant) v = wp_session_item_get_configuration (item);
+    guint64 node_i;
+    const gchar *str;
+    guint32 prio;
+    guchar dir;
+    g_assert_nonnull (v);
+    g_assert_true (g_variant_lookup (v, "node", "t", &node_i));
+    g_assert_cmpuint (node_i, ==, 0);
+    g_assert_true (g_variant_lookup (v, "name", "&s", &str));
+    g_assert_cmpstr (str, ==, "");
+    g_assert_true (g_variant_lookup (v, "media-class", "&s", &str));
+    g_assert_cmpstr (str, ==, "");
+    g_assert_true (g_variant_lookup (v, "role", "&s", &str));
+    g_assert_cmpstr (str, ==, "");
+    g_assert_true (g_variant_lookup (v, "priority", "u", &prio));
+    g_assert_cmpuint (prio, ==, 0);
+    g_assert_true (g_variant_lookup (v, "direction", "y", &dir));
+    g_assert_cmpuint (dir, ==, WP_DIRECTION_INPUT);
+  }
+}
+
+gint
+main (gint argc, gchar *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+  pw_init (NULL, NULL);
+  g_log_set_writer_func (wp_log_writer_default, NULL, NULL);
+
+  const TestConfigureActivateData fakesink_data = {
+    "fakesink", "fakesink0", "Fake/Sink", "Fake/Sink", WP_DIRECTION_INPUT
+  };
+  g_test_add ("/modules/si-simple-node-endpoint/configure-activate/fakesink",
+      TestFixture, &fakesink_data,
+      test_si_simple_node_endpoint_setup,
+      test_si_simple_node_endpoint_configure_activate,
+      test_si_simple_node_endpoint_teardown);
+
+  const TestConfigureActivateData fakesrc_data = {
+    "fakesrc", "fakesrc0", "Fake/Source", "Fake/Source", WP_DIRECTION_OUTPUT
+  };
+  g_test_add ("/modules/si-simple-node-endpoint/configure-activate/fakesrc",
+      TestFixture, &fakesrc_data,
+      test_si_simple_node_endpoint_setup,
+      test_si_simple_node_endpoint_configure_activate,
+      test_si_simple_node_endpoint_teardown);
+
+  const TestConfigureActivateData audiotestsrc_data = {
+    "audiotestsrc", "audiotestsrc0", NULL, "Audio/Source", WP_DIRECTION_OUTPUT
+  };
+  g_test_add ("/modules/si-simple-node-endpoint/configure-activate/audiotestsrc",
+      TestFixture, &audiotestsrc_data,
+      test_si_simple_node_endpoint_setup,
+      test_si_simple_node_endpoint_configure_activate,
+      test_si_simple_node_endpoint_teardown);
+
+  return g_test_run ();
+}