diff --git a/.gitignore b/.gitignore
index 0a99b2907..168cf4e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ doc/protocol.html
 doc/protocol
 doc/api
 test/software_volume
+test/run_decoder
diff --git a/Makefile.am b/Makefile.am
index 17eb49eb9..fee0b18fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -502,7 +502,24 @@ sparse-check:
 
 if ENABLE_TEST
 
-noinst_PROGRAMS = test/software_volume
+noinst_PROGRAMS = \
+	test/run_decoder \
+	test/software_volume
+
+test_run_decoder_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(ID3TAG_CFLAGS) \
+	$(INPUT_CFLAGS) $(DECODER_CFLAGS)
+test_run_decoder_LDADD = $(MPD_LIBS) \
+	$(ID3TAG_LIBS) \
+	$(INPUT_LIBS) $(DECODER_LIBS)
+test_run_decoder_SOURCES = test/run_decoder.c \
+	src/conf.c src/buffer2array.c src/utils.c src/log.c \
+	src/tag.c src/tag_pool.c src/tag_id3.c \
+	src/replay_gain.c \
+	src/uri.c \
+	$(ARCHIVE_SRC) \
+	$(INPUT_SRC) \
+	$(DECODER_SRC)
 
 test_software_volume_SOURCES = test/software_volume.c \
 	src/audio_parser.c \
diff --git a/test/run_decoder.c b/test/run_decoder.c
new file mode 100644
index 000000000..8d11494c7
--- /dev/null
+++ b/test/run_decoder.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "decoder_list.h"
+#include "decoder_api.h"
+#include "input_stream.h"
+#include "audio_format.h"
+#include "pcm_volume.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <unistd.h>
+
+/**
+ * No-op dummy.
+ */
+void
+pcm_volume(G_GNUC_UNUSED void *buffer, G_GNUC_UNUSED int length,
+	   G_GNUC_UNUSED const struct audio_format *format,
+	   G_GNUC_UNUSED int volume)
+{
+}
+
+struct decoder {
+	const char *uri;
+
+	const struct decoder_plugin *plugin;
+
+	bool initialized;
+};
+
+void
+decoder_initialized(struct decoder *decoder,
+		    const struct audio_format *audio_format,
+		    G_GNUC_UNUSED bool seekable,
+		    G_GNUC_UNUSED float total_time)
+{
+	assert(!decoder->initialized);
+	assert(audio_format_valid(audio_format));
+
+	g_printerr("audio_format=%u:%u:%u\n", audio_format->sample_rate,
+		   audio_format->bits, audio_format->channels);
+
+	decoder->initialized = true;
+}
+
+char *decoder_get_uri(struct decoder *decoder)
+{
+	return g_strdup(decoder->uri);
+}
+
+enum decoder_command
+decoder_get_command(G_GNUC_UNUSED struct decoder *decoder)
+{
+	return DECODE_COMMAND_NONE;
+}
+
+void decoder_command_finished(G_GNUC_UNUSED struct decoder *decoder)
+{
+}
+
+double decoder_seek_where(G_GNUC_UNUSED struct decoder *decoder)
+{
+	return 1.0;
+}
+
+void decoder_seek_error(G_GNUC_UNUSED struct decoder *decoder)
+{
+}
+
+size_t
+decoder_read(G_GNUC_UNUSED struct decoder *decoder,
+	     struct input_stream *is,
+	     void *buffer, size_t length)
+{
+	return input_stream_read(is, buffer, length);
+}
+
+enum decoder_command
+decoder_data(G_GNUC_UNUSED struct decoder *decoder,
+	     G_GNUC_UNUSED struct input_stream *is,
+	     const void *data, size_t datalen,
+	     G_GNUC_UNUSED float data_time, G_GNUC_UNUSED uint16_t bit_rate,
+	     G_GNUC_UNUSED struct replay_gain_info *replay_gain_info)
+{
+	write(1, data, datalen);
+	return DECODE_COMMAND_NONE;
+}
+
+enum decoder_command
+decoder_tag(G_GNUC_UNUSED struct decoder *decoder,
+	    G_GNUC_UNUSED struct input_stream *is,
+	    G_GNUC_UNUSED const struct tag *tag)
+{
+	return DECODE_COMMAND_NONE;
+}
+
+int main(int argc, char **argv)
+{
+	bool ret;
+	const char *decoder_name;
+	struct decoder decoder;
+
+	if (argc != 3) {
+		g_printerr("Usage: run_decoder DECODER URI >OUT\n");
+		return 1;
+	}
+
+	decoder_name = argv[1];
+	decoder.uri = argv[2];
+
+	decoder_plugin_init_all();
+
+	decoder.plugin = decoder_plugin_from_name(decoder_name);
+	if (decoder.plugin == NULL) {
+		g_printerr("No such decoder: %s\n", decoder_name);
+		return 1;
+	}
+
+	if (decoder.plugin->file_decode != NULL) {
+		decoder_plugin_file_decode(decoder.plugin, &decoder,
+					   decoder.uri);
+	} else if (decoder.plugin->stream_decode != NULL) {
+		struct input_stream is;
+
+		ret = input_stream_open(&is, decoder.uri);
+		if (!ret)
+			return 1;
+
+		decoder_plugin_stream_decode(decoder.plugin, &decoder, &is);
+
+		input_stream_close(&is);
+	} else {
+		g_printerr("Decoder plugin is not usable\n");
+		return 1;
+	}
+
+	decoder_plugin_deinit_all();
+
+	if (!decoder.initialized) {
+		g_printerr("Decoding failed\n");
+		return 1;
+	}
+
+	return 0;
+}