diff --git a/configure.ac b/configure.ac
index 2cc5cf1cb6..0b58d2b572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -953,13 +953,13 @@ tests/examples/app/Makefile
 tests/examples/dynamic/Makefile
 tests/examples/gio/Makefile
 tests/examples/overlay/Makefile
-tests/examples/playback/Makefile
 tests/examples/seek/Makefile
 tests/examples/snapshot/Makefile
 tests/examples/volume/Makefile
 tests/examples/v4l/Makefile
 tests/files/Makefile
 tests/icles/Makefile
+tests/icles/playback/Makefile
 docs/Makefile
 docs/design/Makefile
 docs/libs/Makefile
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 5ec1e0ac90..e2e13ab44a 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -8,8 +8,8 @@ if USE_GIO
 GIO_SUBDIRS = gio
 endif
 
-SUBDIRS = app  dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playback volume v4l
+SUBDIRS = app  dynamic $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay volume v4l
 
-DIST_SUBDIRS = app dynamic gio overlay playback seek snapshot volume v4l
+DIST_SUBDIRS = app dynamic gio overlay seek snapshot volume v4l
 
 include $(top_srcdir)/common/parallel-subdirs.mak
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 36082240c0..8fbdb92713 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = playback
+DIST_SUBDIRS = playback
+
 if USE_X
 X_TESTS = stress-xoverlay
 
diff --git a/tests/examples/playback/.gitignore b/tests/icles/playback/.gitignore
similarity index 100%
rename from tests/examples/playback/.gitignore
rename to tests/icles/playback/.gitignore
diff --git a/tests/examples/playback/Makefile.am b/tests/icles/playback/Makefile.am
similarity index 100%
rename from tests/examples/playback/Makefile.am
rename to tests/icles/playback/Makefile.am
diff --git a/tests/examples/playback/decodetest.c b/tests/icles/playback/decodetest.c
similarity index 100%
rename from tests/examples/playback/decodetest.c
rename to tests/icles/playback/decodetest.c
diff --git a/tests/examples/playback/test.c b/tests/icles/playback/test.c
similarity index 100%
rename from tests/examples/playback/test.c
rename to tests/icles/playback/test.c
diff --git a/tests/examples/playback/test2.c b/tests/icles/playback/test2.c
similarity index 100%
rename from tests/examples/playback/test2.c
rename to tests/icles/playback/test2.c
diff --git a/tests/examples/playback/test3.c b/tests/icles/playback/test3.c
similarity index 100%
rename from tests/examples/playback/test3.c
rename to tests/icles/playback/test3.c
diff --git a/tests/examples/playback/test4.c b/tests/icles/playback/test4.c
similarity index 100%
rename from tests/examples/playback/test4.c
rename to tests/icles/playback/test4.c
diff --git a/tests/examples/playback/test5.c b/tests/icles/playback/test5.c
similarity index 100%
rename from tests/examples/playback/test5.c
rename to tests/icles/playback/test5.c
diff --git a/tests/examples/playback/test6.c b/tests/icles/playback/test6.c
similarity index 100%
rename from tests/examples/playback/test6.c
rename to tests/icles/playback/test6.c
diff --git a/tests/examples/playback/test7.c b/tests/icles/playback/test7.c
similarity index 100%
rename from tests/examples/playback/test7.c
rename to tests/icles/playback/test7.c