diff --git a/tests/src/pokerth_test/AllTests.java b/tests/src/pokerth_test/AllTests.java
index c2e3d734..3a298011 100644
--- a/tests/src/pokerth_test/AllTests.java
+++ b/tests/src/pokerth_test/AllTests.java
@@ -24,6 +24,7 @@ import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
+	AnnounceTest.class,
 	GuestLoginTest.class,
 	AuthLoginTest.class,
 	PlayerInfoTest.class,
diff --git a/tests/src/pokerth_test/AnnounceTest.java b/tests/src/pokerth_test/AnnounceTest.java
new file mode 100644
index 00000000..8d790398
--- /dev/null
+++ b/tests/src/pokerth_test/AnnounceTest.java
@@ -0,0 +1,62 @@
+package pokerth_test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.net.Socket;
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import pokerth_protocol.AnnounceMessage;
+import pokerth_protocol.PokerTHMessage;
+import pokerth_protocol.AnnounceMessage.AnnounceMessageSequenceType.ServerTypeEnumType;
+
+
+public class AnnounceTest extends TestBase {
+
+	protected void TestAnnounceMsg(AnnounceMessage announce, int numPlayersOnServer) {
+		assertEquals(PROTOCOL_VERSION_MAJOR, announce.getValue().getProtocolVersion().getMajor().intValue());
+		assertEquals(PROTOCOL_VERSION_MINOR, announce.getValue().getProtocolVersion().getMinor().intValue());
+		assertEquals(ServerTypeEnumType.EnumType.serverTypeInternetAuth, announce.getValue().getServerType().getValue());
+		assertEquals(numPlayersOnServer, announce.getValue().getNumPlayersOnServer().intValue());
+	}
+
+	@Test
+	public void testPlayerInfoRequest() throws Exception {
+
+		PokerTHMessage msg = receiveMessage();
+		assertTrue(msg.isAnnounceMessageSelected());
+		TestAnnounceMsg(msg.getAnnounceMessage(), 0);
+
+		// numPlayersOnServer should only be incremented after login.
+		Socket s[] = new Socket[9];
+		for (int i = 0; i < 9; i++) {
+			s[i] = new Socket("localhost", 7234);
+			msg = receiveMessage(s[i]);
+			assertTrue(msg.isAnnounceMessageSelected());
+			// Without login: Counter stays at 0.
+			TestAnnounceMsg(msg.getAnnounceMessage(), 0);
+		}
+
+		Socket t[] = new Socket[9];
+		for (int i = 0; i < 9; i++) {
+			t[i] = new Socket("localhost", 7234);
+			String username = "test" + (i+1);
+			String password = username;
+			userInit(t[i], username, password);
+
+			sock.close();
+			sock = new Socket("localhost", 7234);
+			msg = receiveMessage();
+			assertTrue(msg.isAnnounceMessageSelected());
+			// After login: Counter is incremented.
+			TestAnnounceMsg(msg.getAnnounceMessage(), i + 1);
+		}
+
+		for (int i = 0; i < 9; i++) {
+			s[i].close();
+			t[i].close();
+		}
+	}
+}