diff --git a/Makefile.am b/Makefile.am
index 86a095c4..763c25ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,3 +12,9 @@ EXTRA_DIST =                    \
 	intltool-extract.in
 
 SUBDIRS = bin src po
+
+check: test
+
+test:
+	cd $(top_srcdir)/tests && \
+	python -m unittest discover
diff --git a/tests/graphics/buttons.py b/examples/buttons.py
similarity index 100%
rename from tests/graphics/buttons.py
rename to examples/buttons.py
diff --git a/tests/graphics/cellrenderericon.py b/examples/cellrenderericon.py
similarity index 100%
rename from tests/graphics/cellrenderericon.py
rename to examples/cellrenderericon.py
diff --git a/tests/graphics/common.py b/examples/common.py
similarity index 100%
rename from tests/graphics/common.py
rename to examples/common.py
diff --git a/tests/graphics/customdestroy.py b/examples/customdestroy.py
similarity index 100%
rename from tests/graphics/customdestroy.py
rename to examples/customdestroy.py
diff --git a/tests/graphics/gtktreesensitive.py b/examples/gtktreesensitive.py
similarity index 100%
rename from tests/graphics/gtktreesensitive.py
rename to examples/gtktreesensitive.py
diff --git a/tests/graphics/iconbadges.py b/examples/iconbadges.py
similarity index 100%
rename from tests/graphics/iconbadges.py
rename to examples/iconbadges.py
diff --git a/tests/graphics/iconcache.py b/examples/iconcache.py
similarity index 100%
rename from tests/graphics/iconcache.py
rename to examples/iconcache.py
diff --git a/tests/graphics/iconwidget.py b/examples/iconwidget.py
similarity index 100%
rename from tests/graphics/iconwidget.py
rename to examples/iconwidget.py
diff --git a/tests/graphics/intro.py b/examples/intro.py
similarity index 100%
rename from tests/graphics/intro.py
rename to examples/intro.py
diff --git a/tests/graphics/progress.py b/examples/progress.py
similarity index 100%
rename from tests/graphics/progress.py
rename to examples/progress.py
diff --git a/tests/graphics/tabs.py b/examples/tabs.py
similarity index 100%
rename from tests/graphics/tabs.py
rename to examples/tabs.py
diff --git a/tests/graphics/ticket2855.py b/examples/ticket2855.py
similarity index 100%
rename from tests/graphics/ticket2855.py
rename to examples/ticket2855.py
diff --git a/tests/graphics/ticket2999.py b/examples/ticket2999.py
similarity index 100%
rename from tests/graphics/ticket2999.py
rename to examples/ticket2999.py
diff --git a/tests/graphics/ticket3000.py b/examples/ticket3000.py
similarity index 100%
rename from tests/graphics/ticket3000.py
rename to examples/ticket3000.py
diff --git a/tests/graphics/toolbarpalettes.py b/examples/toolbarpalettes.py
similarity index 100%
rename from tests/graphics/toolbarpalettes.py
rename to examples/toolbarpalettes.py
diff --git a/tests/graphics/toolbuttons.py b/examples/toolbuttons.py
similarity index 100%
rename from tests/graphics/toolbuttons.py
rename to examples/toolbuttons.py
diff --git a/tests/graphics/tray.py b/examples/tray.py
similarity index 100%
rename from tests/graphics/tray.py
rename to examples/tray.py
diff --git a/tests/lib/runall.py b/tests/lib/runall.py
deleted file mode 100644
index ae1bb3ae..00000000
--- a/tests/lib/runall.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2007, Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-import unittest
-
-import test_mime
-
-runner = unittest.TextTestRunner()
-loader = unittest.TestLoader()
-
-suite = unittest.TestSuite()
-suite.addTest(loader.loadTestsFromModule(test_mime))
-
-runner.run(suite)
diff --git a/tests/lib/test_mime.py b/tests/test_mime.py
similarity index 100%
rename from tests/lib/test_mime.py
rename to tests/test_mime.py