diff --git a/consul/client_test.go b/consul/client_test.go
index 980080c78c..7aff15fcef 100644
--- a/consul/client_test.go
+++ b/consul/client_test.go
@@ -9,14 +9,10 @@ import (
 	"time"
 )
 
-func testClient(t *testing.T) (string, *Client) {
-	return testClientDC(t, "dc1")
-}
-
-func testClientDC(t *testing.T, dc string) (string, *Client) {
+func testClientConfig(t *testing.T) (string, *Config) {
 	dir := tmpDir(t)
 	config := DefaultConfig()
-	config.Datacenter = dc
+	config.Datacenter = "dc1"
 	config.DataDir = dir
 
 	// Adjust the ports
@@ -32,6 +28,17 @@ func testClientDC(t *testing.T, dc string) (string, *Client) {
 	config.SerfLANConfig.MemberlistConfig.ProbeInterval = time.Second
 	config.SerfLANConfig.MemberlistConfig.GossipInterval = 100 * time.Millisecond
 
+	return dir, config
+}
+
+func testClient(t *testing.T) (string, *Client) {
+	return testClientDC(t, "dc1")
+}
+
+func testClientDC(t *testing.T, dc string) (string, *Client) {
+	dir, config := testClientConfig(t)
+	config.Datacenter = dc
+
 	client, err := NewClient(config)
 	if err != nil {
 		t.Fatalf("err: %v", err)
@@ -119,3 +126,55 @@ func TestClient_RPC(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 }
+
+func TestClient_RPC_TLS(t *testing.T) {
+	dir1, conf1 := testServerConfig(t)
+	conf1.VerifyIncoming = true
+	conf1.VerifyOutgoing = true
+	configureTLS(conf1)
+	s1, err := NewServer(conf1)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	defer os.RemoveAll(dir1)
+	defer s1.Shutdown()
+
+	dir2, conf2 := testClientConfig(t)
+	conf2.VerifyOutgoing = true
+	configureTLS(conf2)
+	c1, err := NewClient(conf2)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	defer os.RemoveAll(dir2)
+	defer c1.Shutdown()
+
+	// Try an RPC
+	var out struct{}
+	if err := c1.RPC("Status.Ping", struct{}{}, &out); err != structs.ErrNoServers {
+		t.Fatalf("err: %v", err)
+	}
+
+	// Try to join
+	addr := fmt.Sprintf("127.0.0.1:%d",
+		s1.config.SerfLANConfig.MemberlistConfig.BindPort)
+	if _, err := c1.JoinLAN([]string{addr}); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	// Check the members
+	if len(s1.LANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
+
+	if len(c1.LANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
+
+	time.Sleep(10 * time.Millisecond)
+
+	// RPC shoudl succeed
+	if err := c1.RPC("Status.Ping", struct{}{}, &out); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+}
diff --git a/consul/server_test.go b/consul/server_test.go
index a1f5604793..45edac53d9 100644
--- a/consul/server_test.go
+++ b/consul/server_test.go
@@ -25,6 +25,12 @@ func tmpDir(t *testing.T) string {
 	return dir
 }
 
+func configureTLS(config *Config) {
+	config.CAFile = "../test/ca/root.cer"
+	config.CertFile = "../test/key/ourdomain.cer"
+	config.KeyFile = "../test/key/ourdomain.key"
+}
+
 func testServerConfig(t *testing.T) (string, *Config) {
 	dir := tmpDir(t)
 	config := DefaultConfig()
@@ -225,3 +231,55 @@ func TestServer_RPC(t *testing.T) {
 		t.Fatalf("err: %v", err)
 	}
 }
+
+func TestServer_JoinLAN_TLS(t *testing.T) {
+	dir1, conf1 := testServerConfig(t)
+	conf1.VerifyIncoming = true
+	conf1.VerifyOutgoing = true
+	configureTLS(conf1)
+	s1, err := NewServer(conf1)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	defer os.RemoveAll(dir1)
+	defer s1.Shutdown()
+
+	dir2, conf2 := testServerConfig(t)
+	conf2.Bootstrap = false
+	conf2.VerifyIncoming = true
+	conf2.VerifyOutgoing = true
+	configureTLS(conf2)
+	s2, err := NewServer(conf2)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	defer os.RemoveAll(dir2)
+	defer s2.Shutdown()
+
+	// Try to join
+	addr := fmt.Sprintf("127.0.0.1:%d",
+		s1.config.SerfLANConfig.MemberlistConfig.BindPort)
+	if _, err := s2.JoinLAN([]string{addr}); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	// Check the members
+	if len(s1.LANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
+
+	if len(s2.LANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
+
+	// Wait a while
+	time.Sleep(100 * time.Millisecond)
+
+	// Verify Raft has established a peer
+	if s1.Stats()["raft"]["num_peers"] != "1" {
+		t.Fatalf("bad: %v", s1.Stats()["raft"])
+	}
+	if s2.Stats()["raft"]["num_peers"] != "1" {
+		t.Fatalf("bad: %v", s2.Stats()["raft"])
+	}
+}