@@ -776,11 +776,17 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaveOnPendingJoin(c *check.C) {

 	c.Assert(err, checker.IsNil)

 	id = strings.TrimSpace(id)

-	go d2.Join(swarm.JoinRequest{

-		RemoteAddrs: []string{"nosuchhost:1234"},

+	err = d2.Join(swarm.JoinRequest{

+		RemoteAddrs: []string{"123.123.123.123:1234"},

 	})

+	c.Assert(err, check.NotNil)

+	c.Assert(err.Error(), checker.Contains, "Timeout was reached")

-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkLocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)

+	info, err := d2.info()

+	c.Assert(err, checker.IsNil)

+	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStatePending)

+

+	c.Assert(d2.Leave(true), checker.IsNil)

 	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.Equals, 1)

@@ -792,11 +798,13 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaveOnPendingJoin(c *check.C) {

 // #23705

 func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {

 	d := s.AddDaemon(c, false, false)

-	go d.Join(swarm.JoinRequest{

-		RemoteAddrs: []string{"nosuchhost:1234"},

+	err := d.Join(swarm.JoinRequest{

+		RemoteAddrs: []string{"123.123.123.123:1234"},

 	})

+	c.Assert(err, check.NotNil)

+	c.Assert(err.Error(), checker.Contains, "Timeout was reached")

-	waitAndAssert(c, defaultReconciliationTimeout, d.checkLocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)

+	waitAndAssert(c, defaultReconciliationTimeout, d.checkLocalNodeState, checker.Equals, swarm.LocalNodeStatePending)

 	c.Assert(d.Stop(), checker.IsNil)

 	c.Assert(d.Start(), checker.IsNil)