diff --git a/src/tests/kits/media/media_client/media_client.cpp b/src/tests/kits/media/media_client/media_client.cpp
index 534f1c9dad..40fd5e0575 100644
--- a/src/tests/kits/media/media_client/media_client.cpp
+++ b/src/tests/kits/media/media_client/media_client.cpp
@@ -8,22 +8,90 @@
 #include <SupportDefs.h>
 
 #include <assert.h>
+#include <stdio.h>
+
+
+static BMediaClient* sProducer = NULL;
+static BMediaClient* sConsumer = NULL;
+static BMediaClient* sFilter = NULL;
+
+
+void _InitClients(bool hasFilter)
+{
+	BMediaClient* sProducer = new BMediaClient("MediaClientProducer");
+	BMediaClient* sConsumer = new BMediaClient("MediaClientConsumer");
+	if (hasFilter)
+		sFilter = new BMediaClient("MediaClientFilter");
+	else
+		sFilter = NULL;
+}
+
+
+void _DeleteClients()
+{
+	delete sProducer;
+	delete sConsumer;
+	delete sFilter;
+}
+
+
+void _ConsumerProducerTest()
+{
+	_InitClients(false);
+
+	BMediaConnection* output = sProducer->BeginConnection(B_MEDIA_OUTPUT);
+	BMediaConnection* input = sConsumer->BeginConnection(B_MEDIA_INPUT);
+
+	assert(sConsumer->Connect(input, output) == B_OK);
+	assert(sConsumer->Disconnect() == B_OK);
+
+	_DeleteClients();
+}
+
+
+void _ProducerConsumerTest()
+{
+	_InitClients(false);
+
+	BMediaConnection* output = sProducer->BeginConnection(B_MEDIA_OUTPUT);
+	BMediaConnection* input = sConsumer->BeginConnection(B_MEDIA_INPUT);
+
+	assert(sProducer->Connect(output, input) == B_OK);
+	assert(sProducer->Disconnect() == B_OK);
+
+	_DeleteClients();
+}
+
+
+void _ProducerFilterConsumerTest()
+{
+	_InitClients(true);
+
+	BMediaConnection* output = sProducer->BeginConnection(B_MEDIA_OUTPUT);
+	BMediaConnection* input = sConsumer->BeginConnection(B_MEDIA_INPUT);
+
+	BMediaConnection* filterInput = sFilter->BeginConnection(B_MEDIA_INPUT);
+	BMediaConnection* filterOutput = sFilter->BeginConnection(B_MEDIA_OUTPUT);
+
+	assert(sProducer->Connect(output, filterInput) == B_OK);
+	assert(sProducer->Connect(filterOutput, input) == B_OK);
+
+	assert(sFilter->Disconnect() == B_OK);
+
+	_DeleteClients();
+}
 
 
 int main()
 {
-	BMediaClient* producer = new BMediaClient("MediaClientProducer");
-	BMediaClient* consumer = new BMediaClient("MediaClientConsumer");
+	printf("Testing Simple (1:1) Producer-Consumer configuration: ");
+	_ConsumerProducerTest();
+	_ProducerConsumerTest();
+	printf("OK\n");
 
-	BMediaConnection* output = producer->BeginConnection(B_MEDIA_OUTPUT);
-	BMediaConnection* input = consumer->BeginConnection(B_MEDIA_INPUT);
-
-	assert(consumer->Connect(input, output) == B_OK);
-
-	assert(consumer->Disconnect() == B_OK);
-
-	delete producer;
-	delete consumer;
+	printf("Testing Simple (1:1:1) Producer-Filter-Consumer configuration: ");
+	_ProducerFilterConsumerTest();
+	printf("OK\n");
 
 	return 0;
 }