diff --git a/test/go/src/common/clientserver_test.go b/test/go/src/common/clientserver_test.go
index 26fa7af..3b81423 100644
--- a/test/go/src/common/clientserver_test.go
+++ b/test/go/src/common/clientserver_test.go
@@ -62,14 +62,10 @@
 
 	server := thrift.NewTSimpleServer4(processor, serverTransport, transportFactory, protocolFactory)
 	if err = server.Listen(); err != nil {
-		return
-	}
-	go server.AcceptLoop()
-	server.Serve()
-	if err != nil {
 		t.Errorf("Unable to start server", err)
 		t.FailNow()
 	}
+	go server.AcceptLoop()
 	defer server.Stop()
 	client, err := StartClient(unit.host, unit.port, unit.domain_socket, unit.transport, unit.protocol, unit.ssl)
 	if err != nil {