diff --git a/internal/device-agent/states/connected/connected.go b/internal/device-agent/states/connected/connected.go
index 995c7ec3..c3e2ca22 100644
--- a/internal/device-agent/states/connected/connected.go
+++ b/internal/device-agent/states/connected/connected.go
@@ -38,6 +38,8 @@ type Connected struct {
 	gateways       []*pb.Gateway
 	connectedSince *timestamppb.Timestamp
 	unhealthy      bool
+
+	syncConfigLoop func(ctx context.Context) error
 }
 
 func New(
@@ -47,13 +49,15 @@ func New(
 	deviceHelper pb.DeviceHelperClient,
 	statusUpdates chan<- *pb.AgentStatus,
 ) statemachine.State {
-	return &Connected{
+	c := &Connected{
 		rc:            rc,
 		logger:        logger,
 		notifier:      notifier,
 		deviceHelper:  deviceHelper,
 		statusUpdates: statusUpdates,
 	}
+	c.syncConfigLoop = c.defaultSyncConfigLoop
+	return c
 }
 
 var (
@@ -127,7 +131,7 @@ func (c *Connected) triggerStatusUpdate() {
 	}
 }
 
-func (c *Connected) syncConfigLoop(ctx context.Context) error {
+func (c *Connected) defaultSyncConfigLoop(ctx context.Context) error {
 	apiserverClient, cleanup, err := c.rc.ConnectToAPIServer(ctx)
 	if err != nil {
 		if grpcstatus.Code(err) == codes.Unavailable {
diff --git a/internal/device-agent/states/connected/connected_test.go b/internal/device-agent/states/connected/connected_test.go
new file mode 100644
index 00000000..426ae8e5
--- /dev/null
+++ b/internal/device-agent/states/connected/connected_test.go
@@ -0,0 +1,179 @@
+package connected
+
+import (
+	"context"
+	"fmt"
+	"github.com/nais/device/internal/device-agent/auth"
+	"github.com/nais/device/internal/device-agent/runtimeconfig"
+	"github.com/nais/device/internal/device-agent/statemachine"
+	"github.com/nais/device/internal/notify"
+	"github.com/nais/device/internal/pb"
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"testing"
+	"time"
+)
+
+func TestConnected_Enter(t *testing.T) {
+	logger := logrus.New()
+
+	t.Run("disconnect if unable to configure deviceHelper", func(t *testing.T) {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		defer cancel()
+
+		rc := runtimeconfig.NewMockRuntimeConfig(t)
+		apiServerPeer := &pb.Gateway{}
+		rc.EXPECT().APIServerPeer().Return(apiServerPeer)
+		configuration := &pb.Configuration{}
+		rc.EXPECT().BuildHelperConfiguration([]*pb.Gateway{
+			apiServerPeer,
+		}).Return(configuration)
+
+		deviceHelper := pb.NewMockDeviceHelperClient(t)
+		deviceHelper.EXPECT().Configure(mock.Anything, configuration).Return(nil, fmt.Errorf("unable to configure"))
+
+		notifier := notify.NewMockNotifier(t)
+		notifier.EXPECT().Errorf(mock.Anything, mock.Anything)
+
+		c := &Connected{
+			rc:           rc,
+			logger:       logger,
+			notifier:     notifier,
+			deviceHelper: deviceHelper,
+		}
+		event := c.Enter(ctx)
+		assert.Equal(t, statemachine.EventDisconnect, event)
+	})
+
+	t.Run("syncConfigLoop", func(t *testing.T) {
+		t.Run("returns ErrUnauthenticated", func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+			defer cancel()
+
+			rc, deviceHelper, notifier := setupMocks(t)
+
+			var token *auth.Tokens
+			rc.EXPECT().SetToken(token)
+
+			c := &Connected{
+				rc:           rc,
+				logger:       logger,
+				notifier:     notifier,
+				deviceHelper: deviceHelper,
+				syncConfigLoop: func(ctx context.Context) error {
+					return ErrUnauthenticated
+				},
+			}
+			event := c.Enter(ctx)
+			assert.Equal(t, statemachine.EventDisconnect, event)
+		})
+
+		t.Run("returns unhandled error", func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+			defer cancel()
+
+			rc, deviceHelper, notifier := setupMocks(t)
+
+			c := &Connected{
+				rc:           rc,
+				logger:       logger,
+				notifier:     notifier,
+				deviceHelper: deviceHelper,
+				syncConfigLoop: func(ctx context.Context) error {
+					return fmt.Errorf("unhandled error")
+				},
+			}
+			event := c.Enter(ctx)
+			assert.Equal(t, statemachine.EventDisconnect, event)
+		})
+
+		t.Run("returns context.Canceled", func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+			defer cancel()
+
+			rc, deviceHelper, notifier := setupMocks(t)
+
+			c := &Connected{
+				rc:           rc,
+				logger:       logger,
+				notifier:     notifier,
+				deviceHelper: deviceHelper,
+				syncConfigLoop: func(ctx context.Context) error {
+					return context.Canceled
+				},
+			}
+			event := c.Enter(ctx)
+			assert.Equal(t, statemachine.EventWaitForExternalEvent, event)
+		})
+
+		t.Run("returns ErrUnavailable", func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+			defer cancel()
+
+			rc, deviceHelper, notifier := setupMocks(t)
+
+			alreadyCalled := false
+
+			c := &Connected{
+				rc:           rc,
+				logger:       logger,
+				notifier:     notifier,
+				deviceHelper: deviceHelper,
+				syncConfigLoop: func(ctx context.Context) error {
+					if alreadyCalled {
+						return context.Canceled
+					}
+					alreadyCalled = true
+					return ErrUnavailable
+				},
+			}
+			event := c.Enter(ctx)
+			assert.Equal(t, statemachine.EventWaitForExternalEvent, event)
+		})
+
+		t.Run("returns ErrLostConnection", func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+			defer cancel()
+
+			rc, deviceHelper, notifier := setupMocks(t)
+
+			alreadyCalled := false
+
+			c := &Connected{
+				rc:           rc,
+				logger:       logger,
+				notifier:     notifier,
+				deviceHelper: deviceHelper,
+				syncConfigLoop: func(ctx context.Context) error {
+					if alreadyCalled {
+						return context.Canceled
+					}
+					alreadyCalled = true
+					return ErrLostConnection
+				},
+			}
+			event := c.Enter(ctx)
+			assert.Equal(t, statemachine.EventWaitForExternalEvent, event)
+		})
+	})
+}
+
+func setupMocks(t *testing.T) (*runtimeconfig.MockRuntimeConfig, *pb.MockDeviceHelperClient, *notify.MockNotifier) {
+	rc := runtimeconfig.NewMockRuntimeConfig(t)
+	apiServerPeer := &pb.Gateway{}
+	rc.EXPECT().APIServerPeer().Return(apiServerPeer)
+	configuration := &pb.Configuration{}
+	rc.EXPECT().BuildHelperConfiguration([]*pb.Gateway{
+		apiServerPeer,
+	}).Return(configuration)
+
+	deviceHelper := pb.NewMockDeviceHelperClient(t)
+	deviceHelper.EXPECT().Configure(mock.Anything, configuration).Return(nil, nil)
+	deviceHelper.EXPECT().Teardown(mock.Anything, &pb.TeardownRequest{}).Return(nil, nil)
+
+	notifier := notify.NewMockNotifier(t)
+	notifier.EXPECT().Errorf(mock.Anything, mock.Anything).Maybe()
+	notifier.EXPECT().Infof(mock.Anything, mock.Anything).Maybe()
+	return rc, deviceHelper, notifier
+}