diff --git a/integration/health_test.go b/integration/health_test.go
index 8c6d7397..8a2d588a 100644
--- a/integration/health_test.go
+++ b/integration/health_test.go
@@ -24,11 +24,13 @@ import (
 	"net/http"
 	"sync"
 	"testing"
+	"time"
 
 	"github.com/palantir/pkg/httpserver"
 	"github.com/palantir/witchcraft-go-server/config"
 	"github.com/palantir/witchcraft-go-server/conjure/witchcraft/api/health"
 	"github.com/palantir/witchcraft-go-server/status"
+	"github.com/palantir/witchcraft-go-server/status/health/periodic"
 	"github.com/palantir/witchcraft-go-server/status/reporter"
 	"github.com/palantir/witchcraft-go-server/witchcraft"
 	"github.com/stretchr/testify/assert"
@@ -200,6 +202,81 @@ func TestHealthReporter(t *testing.T) {
 	}
 }
 
+// TestPeriodicHealthSource tests that basic periodic healthcheck wiring works properly. Unit testing covers the grace
+// period logic - this test covers the plumbing.
+func TestPeriodicHealthSource(t *testing.T) {
+	inputSource := periodic.Source{
+		Checks: map[health.CheckType]periodic.CheckFunc{
+			"HEALTHY_CHECK": func(ctx context.Context) *health.HealthCheckResult {
+				return &health.HealthCheckResult{
+					Type:  "HEALTHY_CHECK",
+					State: health.HealthStateHealthy,
+				}
+			},
+			"ERROR_CHECK": func(ctx context.Context) *health.HealthCheckResult {
+				return &health.HealthCheckResult{
+					Type:    "ERROR_CHECK",
+					State:   health.HealthStateError,
+					Message: stringPtr("something went wrong"),
+					Params:  map[string]interface{}{"foo": "bar"},
+				}
+			},
+		},
+	}
+	expectedStatus := health.HealthStatus{Checks: map[health.CheckType]health.HealthCheckResult{
+		"HEALTHY_CHECK": {
+			Type:    "HEALTHY_CHECK",
+			State:   health.HealthStateHealthy,
+			Message: nil,
+			Params:  make(map[string]interface{}),
+		},
+		"ERROR_CHECK": {
+			Type:    "ERROR_CHECK",
+			State:   health.HealthStateError,
+			Message: stringPtr("No successful checks during 1m0s grace period: something went wrong"),
+			Params:  map[string]interface{}{"foo": "bar"},
+		},
+		health.CheckType("SERVER_STATUS"): {
+			Type:    health.CheckType("SERVER_STATUS"),
+			State:   health.HealthStateHealthy,
+			Message: nil,
+			Params:  make(map[string]interface{}),
+		},
+	}}
+	periodicHealthCheckSource := periodic.FromHealthCheckSource(context.Background(), time.Second*60, time.Millisecond*1, inputSource)
+
+	port, err := httpserver.AvailablePort()
+	require.NoError(t, err)
+	server, serverErr, cleanup := createAndRunCustomTestServer(t, port, port, nil, ioutil.Discard, func(t *testing.T, initFn witchcraft.InitFunc, installCfg config.Install, logOutputBuffer io.Writer) *witchcraft.Server {
+		return createTestServer(t, initFn, installCfg, logOutputBuffer).WithHealth(periodicHealthCheckSource)
+	})
+
+	defer func() {
+		require.NoError(t, server.Close())
+	}()
+	defer cleanup()
+
+	// Wait for checks to run at least once
+	time.Sleep(5 * time.Millisecond)
+
+	resp, err := testServerClient().Get(fmt.Sprintf("https://localhost:%d/%s/%s", port, basePath, status.HealthEndpoint))
+	require.NoError(t, err)
+
+	bytes, err := ioutil.ReadAll(resp.Body)
+	require.NoError(t, err)
+
+	var healthResults health.HealthStatus
+	err = json.Unmarshal(bytes, &healthResults)
+	require.NoError(t, err)
+	assert.Equal(t, expectedStatus, healthResults)
+
+	select {
+	case err := <-serverErr:
+		require.NoError(t, err)
+	default:
+	}
+}
+
 // TestHealthSharedSecret verifies that a non-empty health check shared secret is required by the endpoint when configured.
 // If the secret is not provided or is incorrect, the endpoint returns 401 Unauthorized.
 func TestHealthSharedSecret(t *testing.T) {
@@ -280,3 +357,7 @@ func (cwt healthCheckWithType) HealthStatus(_ context.Context) health.HealthStat
 		},
 	}
 }
+
+func stringPtr(s string) *string {
+	return &s
+}
diff --git a/status/health/periodic/source.go b/status/health/periodic/source.go
index 58313887..e55da0c9 100644
--- a/status/health/periodic/source.go
+++ b/status/health/periodic/source.go
@@ -63,9 +63,10 @@ func NewHealthCheckSource(ctx context.Context, gracePeriod time.Duration, retryI
 // of error.
 func FromHealthCheckSource(ctx context.Context, gracePeriod time.Duration, retryInterval time.Duration, source Source) status.HealthCheckSource {
 	checker := &healthCheckSource{
+		source:        source,
 		gracePeriod:   gracePeriod,
 		retryInterval: retryInterval,
-		source:        source,
+		checkStates:   map[health.CheckType]*checkState{},
 	}
 	go wapp.RunWithRecoveryLogging(ctx, checker.runPoll)
 	return checker
@@ -127,8 +128,8 @@ func (h *healthCheckSource) runPoll(ctx context.Context) {
 
 func (h *healthCheckSource) doPoll(ctx context.Context) {
 	type resultWithTime struct {
-		time   time.Time
 		result *health.HealthCheckResult
+		time   time.Time
 	}
 
 	// Run checks
@@ -144,13 +145,15 @@ func (h *healthCheckSource) doPoll(ctx context.Context) {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
 	for _, resultWithTime := range resultsWithTimes {
-		state := h.checkStates[resultWithTime.result.Type]
-		state.lastResult = resultWithTime.result
-		state.lastResultTime = resultWithTime.time
+		newState := &checkState{
+			lastResult:     resultWithTime.result,
+			lastResultTime: resultWithTime.time,
+		}
 		if resultWithTime.result.State == health.HealthStateHealthy {
-			state.lastSuccess = resultWithTime.result
-			state.lastSuccessTime = resultWithTime.time
+			newState.lastSuccess = resultWithTime.result
+			newState.lastSuccessTime = resultWithTime.time
 		}
+		h.checkStates[resultWithTime.result.Type] = newState
 	}
 }