diff --git a/.gitignore b/.gitignore
index cea69ba03..f7ec90589 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ doc/developer
 doc/sticker
 doc/api
 test/software_volume
+test/run_convert
 test/run_decoder
 test/read_tags
 test/run_filter
diff --git a/Makefile.am b/Makefile.am
index 250360e01..58d1964e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -741,6 +741,7 @@ noinst_PROGRAMS = \
 	test/run_filter \
 	test/run_output \
 	test/read_mixer \
+	test/run_convert \
 	test/software_volume
 
 test_read_conf_CPPFLAGS = $(AM_CPPFLAGS) \
@@ -866,6 +867,25 @@ test_software_volume_SOURCES = test/software_volume.c \
 test_software_volume_LDADD = \
 	$(GLIB_LIBS)
 
+test_run_convert_SOURCES = test/run_convert.c \
+	src/audio_check.c \
+	src/audio_parser.c \
+	src/pcm_channels.c \
+	src/pcm_format.c \
+	src/pcm_dither.c \
+	src/pcm_byteswap.c \
+	src/pcm_resample.c \
+	src/pcm_resample_fallback.c \
+	src/pcm_convert.c
+test_run_convert_CPPFLAGS = $(AM_CPPFLAGS) $(SAMPLERATE_CFLAGS)
+test_run_convert_LDADD = \
+	$(SAMPLERATE_LIBS) \
+	$(GLIB_LIBS)
+
+if HAVE_LIBSAMPLERATE
+test_run_convert_SOURCES += src/pcm_resample_libsamplerate.c
+endif
+
 test_run_output_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS) \
 	$(OUTPUT_CFLAGS)
diff --git a/test/run_convert.c b/test/run_convert.c
new file mode 100644
index 000000000..8e82ba52f
--- /dev/null
+++ b/test/run_convert.c
@@ -0,0 +1,86 @@
+/*
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/*
+ * This program is a command line interface to MPD's PCM conversion
+ * library (pcm_convert.c).
+ *
+ */
+
+#include "config.h"
+#include "audio_parser.h"
+#include "audio_format.h"
+#include "pcm_convert.h"
+#include "conf.h"
+
+#include <glib.h>
+
+#include <stddef.h>
+#include <unistd.h>
+
+const char *
+config_get_string(G_GNUC_UNUSED const char *name, const char *default_value)
+{
+	return default_value;
+}
+
+int main(int argc, char **argv)
+{
+	GError *error = NULL;
+	struct audio_format in_audio_format, out_audio_format;
+	struct pcm_convert_state state;
+	static char buffer[4096];
+	const void *output;
+	ssize_t nbytes;
+	size_t length;
+
+	if (argc != 3) {
+		g_printerr("Usage: run_convert IN_FORMAT OUT_FORMAT <IN >OUT\n");
+		return 1;
+	}
+
+	if (!audio_format_parse(&in_audio_format, argv[1],
+				false, &error)) {
+		g_printerr("Failed to parse audio format: %s\n",
+			   error->message);
+		return 1;
+	}
+
+	if (!audio_format_parse(&out_audio_format, argv[2],
+				false, &error)) {
+		g_printerr("Failed to parse audio format: %s\n",
+			   error->message);
+		return 1;
+	}
+
+	pcm_convert_init(&state);
+
+	while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
+		output = pcm_convert(&state, &in_audio_format, buffer, nbytes,
+				     &out_audio_format, &length, &error);
+		if (output == NULL) {
+			g_printerr("Failed to convert: %s\n", error->message);
+			return 2;
+		}
+
+		write(1, output, length);
+	}
+
+	pcm_convert_deinit(&state);
+}