diff --git a/contrib/churn.py b/hgext/churn.py
rename from contrib/churn.py
rename to hgext/churn.py
diff --git a/tests/test-churn b/tests/test-churn
new file mode 100755
--- /dev/null
+++ b/tests/test-churn
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+echo "[extensions]" >> $HGRCPATH
+echo "churn=" >> $HGRCPATH
+
+echo % create test repository
+hg init repo
+cd repo
+echo a > a
+hg ci -Am adda -u user1
+echo b >> a
+echo b > b
+hg ci -Am addb -u user2
+echo c >> a
+echo c >> b
+echo c > c
+hg ci -Am addc -u user3
+
+echo % churn all
+hg churn
+echo % churn up to rev 1
+hg churn -r :1
+echo % churn with aliases
+cat > ../aliases <<EOF
+user1 alias1
+user3 alias3
+EOF
+hg churn --aliases ../aliases
+echo % churn with column specifier
+COLUMNS=40 hg churn
+
diff --git a/tests/test-churn.out b/tests/test-churn.out
new file mode 100644
--- /dev/null
+++ b/tests/test-churn.out
@@ -0,0 +1,19 @@
+% create test repository
+adding a
+adding b
+adding c
+% churn all
+user3      3 ***************************************************************
+user2      2 ******************************************
+user1      1 *********************
+% churn up to rev 1
+user2      2 ***************************************************************
+user1      1 *******************************
+% churn with aliases
+alias3      3 **************************************************************
+user2       2 *****************************************
+alias1      1 ********************
+% churn with column specifier
+user3      3 ***********************
+user2      2 ***************
+user1      1 *******