diff --git a/examples/README b/examples/README
deleted file mode 100644
index 1368f17b..00000000
--- a/examples/README
+++ /dev/null
@@ -1,2 +0,0 @@
-To install just drop the whole directory inside ~/.sugar/activities.
-Then run sugar as usual.
diff --git a/examples/gmail/gmail.activity b/examples/gmail/gmail.activity
deleted file mode 100644
index 50d92c9b..00000000
--- a/examples/gmail/gmail.activity
+++ /dev/null
@@ -1,4 +0,0 @@
-[Activity]
-name = GMail
-id = org.sugar.GMail
-python_module = gmail.GMailActivity
diff --git a/examples/gmail/gmail.py b/examples/gmail/gmail.py
deleted file mode 100755
index 37c8feca..00000000
--- a/examples/gmail/gmail.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-
-import geckoembed
-
-from sugar.activity.Activity import Activity
-import sugar.env
-
-_GMAIL_ACTIVITY_TYPE = "_gmail_google._tcp"
-
-class GMailActivity(Activity):
-	def __init__(self, args):
-		Activity.__init__(self, _GMAIL_ACTIVITY_TYPE)
-
-		profile_path = os.path.join(sugar.env.get_user_dir(), 'gmail')
-		geckoembed.set_profile_path(profile_path)
-		self.set_title("Mail")
-
-		embed = geckoembed.Embed()
-		self.add(embed)
-		embed.show()
-		
-		embed.load_address("http://www.gmail.com")
diff --git a/examples/bots/LICENSE b/tests/bots/LICENSE
similarity index 100%
rename from examples/bots/LICENSE
rename to tests/bots/LICENSE
diff --git a/examples/bots/bots.activity b/tests/bots/bots.activity
similarity index 100%
rename from examples/bots/bots.activity
rename to tests/bots/bots.activity
diff --git a/examples/bots/bots.py b/tests/bots/bots.py
similarity index 100%
rename from examples/bots/bots.py
rename to tests/bots/bots.py
diff --git a/examples/bots/chaitanya.jpg b/tests/bots/chaitanya.jpg
similarity index 100%
rename from examples/bots/chaitanya.jpg
rename to tests/bots/chaitanya.jpg
diff --git a/examples/bots/kiu.jpg b/tests/bots/kiu.jpg
similarity index 100%
rename from examples/bots/kiu.jpg
rename to tests/bots/kiu.jpg
diff --git a/examples/bots/penelope.jpg b/tests/bots/penelope.jpg
similarity index 100%
rename from examples/bots/penelope.jpg
rename to tests/bots/penelope.jpg