diff --git a/MANIFEST b/MANIFEST
index 4cdcd6f..ba349c4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,4 +9,4 @@ archivemail.1
 archivemail.sgml
 examples/archivemail_all
 setup.py
-test_archivemail.py
+test_archivemail
diff --git a/Makefile b/Makefile
index 512f9e3..a43097c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ clean:
 	rm -rf $(HTDOCS)
 
 test:
-	python test_archivemail.py
+	python test_archivemail
 
 clobber: clean
 	rm -rf build dist
diff --git a/README b/README
index 6389006..b55006b 100644
--- a/README
+++ b/README
@@ -36,7 +36,7 @@ INSTALLATION:
 
 If you want to test archivemail:
     cp archivemail archivemail.py
-    python test_archivemail.py
+    python test_archivemail
     (NOTE: This could take over 90 seconds on slower systems)
 
 To install archivemail, run:
diff --git a/TODO b/TODO
index 97ca572..aafd4a5 100644
--- a/TODO
+++ b/TODO
@@ -110,7 +110,7 @@ run. Better to fail gracefully and keep going.
 Think about the best way to specify the names of archives created with
 possibly an --archive-name option.
 
-Add more tests (see top of test_archivemail.py)
+Add more tests (see top of test_archivemail)
 
 We need some better checking to see if we are really looking at a valid
 mbox-format mailbox.
diff --git a/test_archivemail.py b/test_archivemail
similarity index 100%
rename from test_archivemail.py
rename to test_archivemail