diff --git a/test/sbc/Makefile b/test/sbc/Makefile
new file mode 100644
index 000000000..71fa982e8
--- /dev/null
+++ b/test/sbc/Makefile
@@ -0,0 +1,13 @@
+test:
+	./sbc_decoder_test.py fanfare-4sb.sbc fanfare-4sb-decoded.wav
+	./sbc_decoder_test.py fanfare-8sb.sbc fanfare-8sb-decoded.wav
+	./sbc_decoder_test.py fanfare-stereo-4sb.sbc fanfare-stereo-4sb-decoded.wav
+	./sbc_decoder_test.py fanfare-stereo-8sb.sbc fanfare-stereo-8sb-decoded.wav
+
+	./sbc_encoder_test.py fanfare-mono.wav 16 4 31 fanfare-4sb.sbc
+	./sbc_encoder_test.py fanfare-mono.wav 16 8 31 fanfare-8sb.sbc
+	./sbc_encoder_test.py fanfare-stereo.wav 16 4 31 fanfare-stereo-4sb.sbc
+	./sbc_encoder_test.py fanfare-stereo.wav 16 8 31 fanfare-stereo-8sb.sbc
+
+clean:
+	rm -f *.pyc
\ No newline at end of file
diff --git a/test/sbc/fanfare-4sb-decoded.wav b/test/sbc/data/fanfare-4sb-decoded.wav
similarity index 100%
rename from test/sbc/fanfare-4sb-decoded.wav
rename to test/sbc/data/fanfare-4sb-decoded.wav
diff --git a/test/sbc/fanfare-4sb.sbc b/test/sbc/data/fanfare-4sb.sbc
similarity index 100%
rename from test/sbc/fanfare-4sb.sbc
rename to test/sbc/data/fanfare-4sb.sbc
diff --git a/test/sbc/fanfare-8sb-decoded.wav b/test/sbc/data/fanfare-8sb-decoded.wav
similarity index 100%
rename from test/sbc/fanfare-8sb-decoded.wav
rename to test/sbc/data/fanfare-8sb-decoded.wav
diff --git a/test/sbc/fanfare-8sb.sbc b/test/sbc/data/fanfare-8sb.sbc
similarity index 100%
rename from test/sbc/fanfare-8sb.sbc
rename to test/sbc/data/fanfare-8sb.sbc
diff --git a/test/sbc/fanfare.wav b/test/sbc/data/fanfare-mono.wav
similarity index 100%
rename from test/sbc/fanfare.wav
rename to test/sbc/data/fanfare-mono.wav
diff --git a/test/sbc/data/fanfare-short-mono.wav b/test/sbc/data/fanfare-short-mono.wav
new file mode 100644
index 000000000..06ec83f8f
Binary files /dev/null and b/test/sbc/data/fanfare-short-mono.wav differ
diff --git a/test/sbc/data/fanfare-short-stereo.wav b/test/sbc/data/fanfare-short-stereo.wav
new file mode 100644
index 000000000..7586cf88d
Binary files /dev/null and b/test/sbc/data/fanfare-short-stereo.wav differ
diff --git a/test/sbc/data/fanfare-stereo.wav b/test/sbc/data/fanfare-stereo.wav
new file mode 100644
index 000000000..617ed9b20
Binary files /dev/null and b/test/sbc/data/fanfare-stereo.wav differ
diff --git a/test/sbc/data/sawtooth-mono.wav b/test/sbc/data/sawtooth-mono.wav
new file mode 100644
index 000000000..71edec551
Binary files /dev/null and b/test/sbc/data/sawtooth-mono.wav differ
diff --git a/test/sbc/data/sine-mono.wav b/test/sbc/data/sine-mono.wav
new file mode 100644
index 000000000..6dcdc8165
Binary files /dev/null and b/test/sbc/data/sine-mono.wav differ
diff --git a/test/sbc/data/sine-stereo.wav b/test/sbc/data/sine-stereo.wav
new file mode 100644
index 000000000..398250d85
Binary files /dev/null and b/test/sbc/data/sine-stereo.wav differ
diff --git a/test/sbc/data/square-mono.wav b/test/sbc/data/square-mono.wav
new file mode 100644
index 000000000..25a1ecbe4
Binary files /dev/null and b/test/sbc/data/square-mono.wav differ