diff --git a/ChangeLog b/ChangeLog
index cf6915e..f401110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,8 @@
 2009-05-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
-	reviewed by: <delete if not using a buddy>
-	patch by: <delete if not someone else's patch>
-
-	* morituri/common/common.py:
-	* morituri/image/toc.py:
+	* Makefile.am:
+	* morituri/test/Makefile.am:
+	  Make distcheck work.
 
 2009-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
diff --git a/Makefile.am b/Makefile.am
index b50a650..50543fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,13 +7,10 @@ SUBDIRS = bin etc morituri doc m4 misc
 
 EXTRA_DIST = morituri.spec morituri.doap RELEASE
 
-check: pychecker check-python check-bash
+check: pychecker check-python
 
 check-python:
-	trial morituri.test
-
-check-bash:
-	$(SHELL) $(top_srcdir)/morituri/test/test_bash_completion.sh $(top_builddir)/etc/bash_completion.d/morituri
+	PYTHONPATH=$(PYTHONPATH):$(top_srcdir) trial morituri.test
 
 _trial_temp/coverage: $(top_srcdir)/morituri/*.py $(top_srcdir)/morituri/*/*.py
 	trial --coverage morituri.test
diff --git a/morituri/test/Makefile.am b/morituri/test/Makefile.am
index d65b231..6e91dfb 100644
--- a/morituri/test/Makefile.am
+++ b/morituri/test/Makefile.am
@@ -2,7 +2,31 @@ CLEANFILES = *.py{c,o}
 
 EXTRA_DIST = \
 	__init__.py \
-	common.py
+	common.py \
+	test_common_renamer.py \
+	test_image_cue.py \
+	test_image_image.py \
+	test_image_table.py \
+	test_image_toc.py \
+	test_program_cdparanoia.py \
+	test_program_cdrdao.py \
+	bloc.cue \
+	bloc.toc \
+	breeders.cue \
+	breeders.toc \
+	capital.fast.toc \
+	cure.cue \
+	cure.toc \
+	dBAR-011-0010e284-009228a3-9809ff0b.bin \
+	kanye.cue \
+	kings-separate.cue \
+	kings-single.cue \
+	ladyhawke.toc \
+	track-separate.cue \
+	track-single.cue \
+	cdparanoia.progress \
+	cdrdao.readtoc.progress \
+	track.flac
 
 # re-generation of test files when needed
 regenerate: track.flac
@@ -14,3 +38,4 @@ regenerate: track.flac
 
 track.flac:
 	gst-launch audiotestsrc num-buffers=10 samplesperbuffer=588 ! audioconvert ! audio/x-raw-int,channels=2,width=16,height=16,rate=44100 ! flacenc ! filesink location=track.flac
+