diff --git a/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala b/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
index 6670722b02..d39b58d41d 100644
--- a/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
+++ b/akka-remote/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala
@@ -79,6 +79,8 @@ class ClientInitiatedRemoteActorSpec extends JUnitSuite {
   @After
   def finished() {
     s1.shutdown
+    val s2 = RemoteServer.serverFor(HOSTNAME, PORT2)
+    if (s2.isDefined) s2.get.shutdown
     RemoteClient.shutdownAll
     Thread.sleep(1000)
   }
diff --git a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
index fbf723ece5..beb3bd2f46 100644
--- a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
+++ b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
@@ -72,6 +72,8 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite {
   def finished {
     try {
       server.shutdown
+      val s2 = RemoteServer.serverFor(HOSTNAME, PORT2)
+      if (s2.isDefined) s2.get.shutdown
       RemoteClient.shutdownAll
       Thread.sleep(1000)
     } catch {
diff --git a/akka-remote/src/test/scala/ticket/Ticket434Spec.scala b/akka-remote/src/test/scala/ticket/Ticket434Spec.scala
index b27c17cfe5..fd21d5a191 100644
--- a/akka-remote/src/test/scala/ticket/Ticket434Spec.scala
+++ b/akka-remote/src/test/scala/ticket/Ticket434Spec.scala
@@ -14,12 +14,15 @@ import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
 
 class Ticket434Spec extends Spec with ShouldMatchers {
 
+  val HOSTNAME = "localhost"
+  val PORT = 9991
+
   describe("A server managed remote actor") {
-    it("should possible be use a custom service name containing ':'") {
-      val server = new RemoteServer().start("localhost", 9999)
+    it("can use a custom service name containing ':'") {
+      val server = new RemoteServer().start(HOSTNAME, PORT)
       server.register("my:service", actorOf[RemoteActorSpecActorUnidirectional])
 
-      val actor = RemoteClient.actorFor("my:service", 5000L, "localhost", 9999)
+      val actor = RemoteClient.actorFor("my:service", 5000L, HOSTNAME, PORT)
       actor ! "OneWay"
 
       assert(RemoteActorSpecActorUnidirectional.latch.await(1, TimeUnit.SECONDS))
@@ -31,7 +34,7 @@ class Ticket434Spec extends Spec with ShouldMatchers {
   }
 
   describe("The ActorInfoProtocol") {
-    it("should be possible to set the acor id and uuuid") {
+    it("sets the acor id and uuuid") {
       val actorInfoBuilder = ActorInfoProtocol.newBuilder
         .setUuid("unique-id")
         .setId("some-id")