diff --git a/test/src/org/yaaic/test/scenario/AllTests.java b/test/src/org/yaaic/test/scenario/AllTests.java
index e9fdf83..9bc4e23 100644
--- a/test/src/org/yaaic/test/scenario/AllTests.java
+++ b/test/src/org/yaaic/test/scenario/AllTests.java
@@ -33,6 +33,8 @@ public class AllTests {
 		TestSuite suite = new TestSuite("Scenario-Tests");
 		//$JUnit-BEGIN$
 		suite.addTestSuite(ServerListScenarios.class);
+		suite.addTestSuite(ConnectionScenarios.class);
+		suite.addTestSuite(ChannelScenarios.class);
 		//$JUnit-END$
 		return suite;
 	}
diff --git a/test/src/org/yaaic/test/scenario/ChannelScenarios.java b/test/src/org/yaaic/test/scenario/ChannelScenarios.java
new file mode 100644
index 0000000..0ab40bd
--- /dev/null
+++ b/test/src/org/yaaic/test/scenario/ChannelScenarios.java
@@ -0,0 +1,94 @@
+/*
+Yaaic - Yet Another Android IRC Client
+
+Copyright 2009-2010 Sebastian Kaspari
+
+This file is part of Yaaic.
+
+Yaaic is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Yaaic 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package org.yaaic.test.scenario;
+
+
+
+import android.test.ActivityInstrumentationTestCase2;
+
+import com.jayway.android.robotium.solo.Solo;
+
+/**
+ * Scenarios regarding channels of a server
+ * 
+ * @author Sebastian Kaspari <sebastian@yaaic.org>
+ */
+@SuppressWarnings("rawtypes")
+public class ChannelScenarios extends ActivityInstrumentationTestCase2
+{
+	private Solo solo;
+	private ScenarioHelper helper;
+	
+	/**
+	 * Create a new ChannelScenario instance
+	 * 
+	 * @throws ClassNotFoundException
+	 */
+	@SuppressWarnings("unchecked")
+	public ChannelScenarios() throws ClassNotFoundException
+	{
+		super(
+			"org.yaaic",
+			Class.forName("org.yaaic.activity.ServersActivity")
+		);
+	}
+	
+	/**
+	 * Setup test case
+	 */
+	@Override
+	protected void setUp()
+	{
+		solo   = new Solo(getInstrumentation(), getActivity());
+		helper = new ScenarioHelper(solo);
+		
+		helper.createTestServer();
+		helper.connectToServer();
+	}
+	
+	/**
+	 * Cleanup after test
+	 */
+	@Override
+	protected void tearDown()
+	{
+		helper.disconnectFromServer();
+		helper.deleteTestServer();
+		
+		solo.sleep(500);
+	}
+	
+	/**
+	 * Scenario: Write a channel message
+	 * 
+	 * - Connect to server
+	 * - Join test channel
+	 * - Write a message
+	 * - The message is displayed in the view
+	 */
+	public void testSendingChannelMessage()
+	{
+		helper.joinTestChannel();
+		
+		helper.send("Hello Test-World");
+		assertTrue(solo.searchText("<YaaicBotium> Hello Test-World"));
+	}
+}