diff --git a/rpc/test/client_rpc_test.go b/rpc/test/client_rpc_test.go
index 2d9af88a..4b5e6d1e 100644
--- a/rpc/test/client_rpc_test.go
+++ b/rpc/test/client_rpc_test.go
@@ -5,6 +5,9 @@ import (
 	"testing"
 )
 
+// When run with `-test.short` we only run:
+// TestHTTPStatus, TestHTTPBroadcast, TestJSONStatus, TestJSONBroadcast, TestWSConnect, TestWSSend
+
 //--------------------------------------------------------------------------------
 // Test the HTTP client
 
@@ -13,14 +16,23 @@ func TestHTTPStatus(t *testing.T) {
 }
 
 func TestHTTPGenPriv(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testGenPriv(t, "HTTP")
 }
 
 func TestHTTPGetAccount(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testGetAccount(t, "HTTP")
 }
 
 func TestHTTPSignedTx(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testSignedTx(t, "HTTP")
 }
 
@@ -29,18 +41,30 @@ func TestHTTPBroadcastTx(t *testing.T) {
 }
 
 func TestHTTPGetStorage(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testGetStorage(t, "HTTP")
 }
 
 func TestHTTPCallCode(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testCallCode(t, "HTTP")
 }
 
 func TestHTTPCallContract(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testCall(t, "HTTP")
 }
 
 func TestHTTPNameReg(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testNameReg(t, "HTTP")
 }
 
@@ -52,14 +76,23 @@ func TestJSONStatus(t *testing.T) {
 }
 
 func TestJSONGenPriv(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testGenPriv(t, "JSONRPC")
 }
 
 func TestJSONGetAccount(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testGetAccount(t, "JSONRPC")
 }
 
 func TestJSONSignedTx(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testSignedTx(t, "JSONRPC")
 }
 
@@ -68,17 +101,29 @@ func TestJSONBroadcastTx(t *testing.T) {
 }
 
 func TestJSONGetStorage(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testGetStorage(t, "JSONRPC")
 }
 
 func TestJSONCallCode(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testCallCode(t, "JSONRPC")
 }
 
 func TestJSONCallContract(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testCall(t, "JSONRPC")
 }
 
 func TestJSONNameReg(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	testNameReg(t, "JSONRPC")
 }
diff --git a/rpc/test/client_ws_test.go b/rpc/test/client_ws_test.go
index 2ea16c95..d2a4e63a 100644
--- a/rpc/test/client_ws_test.go
+++ b/rpc/test/client_ws_test.go
@@ -37,6 +37,9 @@ func _TestWSNewBlock(t *testing.T) {
 
 // receive a few new block messages in a row, with increasing height
 func TestWSBlockchainGrowth(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	con := newWSCon(t)
 	eid := types.EventStringNewBlock()
 	subscribe(t, con, eid)
@@ -72,6 +75,9 @@ func TestWSSend(t *testing.T) {
 
 // ensure events are only fired once for a given transaction
 func TestWSDoubleFire(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	con := newWSCon(t)
 	eid := types.EventStringAccInput(user[0].Address)
 	subscribe(t, con, eid)
@@ -97,6 +103,9 @@ func TestWSDoubleFire(t *testing.T) {
 
 // create a contract, wait for the event, and send it a msg, validate the return
 func TestWSCallWait(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	con := newWSCon(t)
 	eid1 := types.EventStringAccInput(user[0].Address)
 	subscribe(t, con, eid1)
@@ -133,6 +142,9 @@ func TestWSCallWait(t *testing.T) {
 // create a contract and send it a msg without waiting. wait for contract event
 // and validate return
 func TestWSCallNoWait(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	con := newWSCon(t)
 	amt, gasLim, fee := int64(10000), int64(1000), int64(1000)
 	code, _, returnVal := simpleContract()
@@ -159,6 +171,9 @@ func TestWSCallNoWait(t *testing.T) {
 
 // create two contracts, one of which calls the other
 func TestWSCallCall(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	con := newWSCon(t)
 	amt, gasLim, fee := int64(10000), int64(1000), int64(1000)
 	code, _, returnVal := simpleContract()