diff --git a/Makefile.am b/Makefile.am
index 9123d479d..44ce20fff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1979,6 +1979,7 @@ test_test_pcm_SOURCES = \
 	test/test_pcm_format.cxx \
 	test/test_pcm_volume.cxx \
 	test/test_pcm_mix.cxx \
+	test/test_pcm_export.cxx \
 	test/test_pcm_all.hxx \
 	test/test_pcm_main.cxx
 test_test_pcm_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0
diff --git a/test/test_pcm_all.hxx b/test/test_pcm_all.hxx
index 1c7df82eb..64ad82a32 100644
--- a/test/test_pcm_all.hxx
+++ b/test/test_pcm_all.hxx
@@ -103,4 +103,19 @@ public:
 	void TestMix32();
 };
 
+class PcmExportTest : public CppUnit::TestFixture {
+	CPPUNIT_TEST_SUITE(PcmExportTest);
+	CPPUNIT_TEST(TestShift8);
+	CPPUNIT_TEST(TestPack24);
+	CPPUNIT_TEST(TestReverseEndian);
+	CPPUNIT_TEST(TestDsdUsb);
+	CPPUNIT_TEST_SUITE_END();
+
+public:
+	void TestShift8();
+	void TestPack24();
+	void TestReverseEndian();
+	void TestDsdUsb();
+};
+
 #endif
diff --git a/test/test_pcm_export.cxx b/test/test_pcm_export.cxx
new file mode 100644
index 000000000..ae9bce3f8
--- /dev/null
+++ b/test/test_pcm_export.cxx
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2003-2014 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.
+ */
+
+#include "config.h"
+#include "test_pcm_all.hxx"
+#include "pcm/PcmExport.hxx"
+#include "system/ByteOrder.hxx"
+
+#include <string.h>
+
+void
+PcmExportTest::TestShift8()
+{
+	static constexpr int32_t src[] = { 0x0, 0x1, 0x100, 0x10000, 0xffffff };
+	static constexpr uint32_t expected[] = { 0x0, 0x100, 0x10000, 0x1000000, 0xffffff00 };
+
+	PcmExport e;
+	e.Open(SampleFormat::S24_P32, 2, false, true, false, false);
+
+	size_t dest_size;
+	auto dest = e.Export(src, sizeof(src), dest_size);
+	CPPUNIT_ASSERT_EQUAL(sizeof(expected), dest_size);
+	CPPUNIT_ASSERT(memcmp(dest, expected, dest_size) == 0);
+}
+
+void
+PcmExportTest::TestPack24()
+{
+	static constexpr int32_t src[] = { 0x0, 0x1, 0x100, 0x10000, 0xffffff };
+
+	static constexpr uint8_t expected_be[] = {
+		0, 0, 0x0,
+		0, 0, 0x1,
+		0, 0x1, 0x00,
+		0x1, 0x00, 0x00,
+		0xff, 0xff, 0xff,
+	};
+
+	static constexpr uint8_t expected_le[] = {
+		0, 0, 0x0,
+		0x1, 0, 0,
+		0x00, 0x1, 0,
+		0, 0x00, 0x01,
+		0xff, 0xff, 0xff,
+	};
+
+	static constexpr size_t expected_size = sizeof(expected_be);
+	static const uint8_t *const expected = IsBigEndian()
+		? expected_be : expected_le;
+
+	PcmExport e;
+	e.Open(SampleFormat::S24_P32, 2, false, false, true, false);
+
+	size_t dest_size;
+	auto dest = e.Export(src, sizeof(src), dest_size);
+	CPPUNIT_ASSERT_EQUAL(expected_size, dest_size);
+	CPPUNIT_ASSERT(memcmp(dest, expected, dest_size) == 0);
+}
+
+void
+PcmExportTest::TestReverseEndian()
+{
+	static constexpr uint8_t src[] = {
+		1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
+	};
+
+	static constexpr uint8_t expected2[] = {
+		2, 1, 4, 3, 6, 5, 8, 7, 10, 9, 12, 11
+	};
+
+	static constexpr uint8_t expected4[] = {
+		4, 3, 2, 1, 8, 7, 6, 5, 12, 11, 10, 9,
+	};
+
+	PcmExport e;
+	e.Open(SampleFormat::S8, 2, false, false, false, true);
+
+	size_t dest_size;
+	auto dest = e.Export(src, sizeof(src), dest_size);
+	CPPUNIT_ASSERT_EQUAL(sizeof(src), dest_size);
+	CPPUNIT_ASSERT(memcmp(dest, src, dest_size) == 0);
+
+	e.Open(SampleFormat::S16, 2, false, false, false, true);
+	dest = e.Export(src, sizeof(src), dest_size);
+	CPPUNIT_ASSERT_EQUAL(sizeof(expected2), dest_size);
+	CPPUNIT_ASSERT(memcmp(dest, expected2, dest_size) == 0);
+
+	e.Open(SampleFormat::S32, 2, false, false, false, true);
+	dest = e.Export(src, sizeof(src), dest_size);
+	CPPUNIT_ASSERT_EQUAL(sizeof(expected4), dest_size);
+	CPPUNIT_ASSERT(memcmp(dest, expected4, dest_size) == 0);
+}
+
+void
+PcmExportTest::TestDsdUsb()
+{
+	static constexpr uint8_t src[] = {
+		0x01, 0x23, 0x45, 0x67,
+		0x89, 0xab, 0xcd, 0xef,
+	};
+
+	static constexpr uint32_t expected[] = {
+		0xff050145,
+		0xff052367,
+		0xfffa89cd,
+		0xfffaabef,
+	};
+
+	PcmExport e;
+	e.Open(SampleFormat::DSD, 2, true, false, false, false);
+
+	size_t dest_size;
+	auto dest = e.Export(src, sizeof(src), dest_size);
+	CPPUNIT_ASSERT_EQUAL(sizeof(expected), dest_size);
+	CPPUNIT_ASSERT(memcmp(dest, expected, dest_size) == 0);
+}
diff --git a/test/test_pcm_main.cxx b/test/test_pcm_main.cxx
index 0803e64f5..0e397a15c 100644
--- a/test/test_pcm_main.cxx
+++ b/test/test_pcm_main.cxx
@@ -31,6 +31,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(PcmChannelsTest);
 CPPUNIT_TEST_SUITE_REGISTRATION(PcmVolumeTest);
 CPPUNIT_TEST_SUITE_REGISTRATION(PcmFormatTest);
 CPPUNIT_TEST_SUITE_REGISTRATION(PcmMixTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(PcmExportTest);
 
 int
 main(gcc_unused int argc, gcc_unused char **argv)