diff --git a/.github/workflows/buildtest.yaml b/.github/workflows/buildtest.yaml
index 77f83b13c..8595d2e07 100644
--- a/.github/workflows/buildtest.yaml
+++ b/.github/workflows/buildtest.yaml
@@ -1,4 +1,4 @@
-name: Build and Test
+name: Test
 
 on:
   push:
@@ -7,7 +7,6 @@ on:
     branches: [ master ]
 
 jobs:
-
   test:
     runs-on: ubuntu-latest
     steps:
@@ -17,16 +16,37 @@ jobs:
         path: |
           ~/go/pkg/mod
           ~/go/bin
+          ~/bin/protoc
           ~/.cache
-        key: ${{ runner.os }}-amd64-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-amd64-go-
-    
+        key: livekit-server
+    - uses: shogo82148/actions-setup-redis@v1.10.3
+      with:
+        redis-version: '6.x'
+        auto-start: true
+    - run: redis-cli ping
+
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
         go-version: 1.16
 
+    - name: Download Go modules
+      run: go mod download
+
+    - name: Download protoc
+      run: curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip
+
+    - name: Install protoc
+      run: sudo unzip protoc-3.15.8-linux-x86_64.zip -d /usr
+
+    - run: sudo chmod 755 /usr/bin/protoc
+
+    - name: Install protoc-gen-twirp
+      run: go install github.com/twitchtv/twirp/protoc-gen-twirp
+
+    - name: Install protoc-gen-go
+      run: go install google.golang.org/protobuf/cmd/protoc-gen-go
+
     - name: Mage Build
       uses: magefile/mage-action@v1
       with:
diff --git a/pkg/rtc/transport_test.go b/pkg/rtc/transport_test.go
index 6b46479d8..5e5b8b1d6 100644
--- a/pkg/rtc/transport_test.go
+++ b/pkg/rtc/transport_test.go
@@ -45,7 +45,7 @@ func TestMissingAnswerDuringICERestart(t *testing.T) {
 	require.NoError(t, transportA.CreateAndSendOffer(nil))
 
 	// ensure we are connected the first time
-	time.Sleep(10 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	require.Equal(t, webrtc.ICEConnectionStateConnected, transportA.pc.ICEConnectionState())
 	require.Equal(t, webrtc.ICEConnectionStateConnected, transportB.pc.ICEConnectionState())
 
diff --git a/test/client/client.go b/test/client/client.go
index fe6b6cbcc..4de3c3ac3 100644
--- a/test/client/client.go
+++ b/test/client/client.go
@@ -340,7 +340,6 @@ func (c *RTCClient) ReadResponse() (*livekit.SignalResponse, error) {
 	}
 }
 
-// TODO: this function is not thread safe, need to cleanup
 func (c *RTCClient) SubscribedTracks() map[string][]*webrtc.TrackRemote {
 	// create a copy of this
 	c.lock.Lock()
diff --git a/test/singlenode_test.go b/test/singlenode_test.go
index 3ed6f1bfc..37968f5c6 100644
--- a/test/singlenode_test.go
+++ b/test/singlenode_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/livekit/livekit-server/pkg/logger"
 	testclient "github.com/livekit/livekit-server/test/client"
 	"github.com/stretchr/testify/require"
 )
@@ -40,6 +41,9 @@ func TestSinglePublisher(t *testing.T) {
 		return
 	}
 
+	logger.Infow("\n\n---Starting TestSinglePublisher---")
+	defer logger.Infow("---Finishing TestSinglePublisher---")
+
 	s := setupSingleNodeTest(testRoom)
 	defer func() {
 		teardownTest(s, testRoom)