diff --git a/service/worker/scheduler/workflow.go b/service/worker/scheduler/workflow.go
index a0f0fa0b840..136740dbded 100644
--- a/service/worker/scheduler/workflow.go
+++ b/service/worker/scheduler/workflow.go
@@ -179,7 +179,7 @@ var (
 	currentTweakablePolicies = tweakablePolicies{
 		DefaultCatchupWindow:              365 * 24 * time.Hour,
 		MinCatchupWindow:                  10 * time.Second,
-		RetentionTime:                     0, // TODO: enable later: 7 * 24 * time.Hour,
+		RetentionTime:                     7 * 24 * time.Hour,
 		CanceledTerminatedCountAsFailures: false,
 		AlwaysAppendTimestamp:             true,
 		FutureActionCount:                 10,
@@ -191,8 +191,8 @@ var (
 		MaxBufferSize:                     1000,
 		AllowZeroSleep:                    true,
 		ReuseTimer:                        true,
-		NextTimeCacheV2Size:               14,                       // see note below
-		Version:                           BatchAndCacheTimeQueries, // TODO: set later: NewCacheAndJitter
+		NextTimeCacheV2Size:               14, // see note below
+		Version:                           NewCacheAndJitter,
 	}
 
 	// Note on NextTimeCacheV2Size: This value must be > FutureActionCountForList. Each
diff --git a/service/worker/scheduler/workflow_test.go b/service/worker/scheduler/workflow_test.go
index 5b5dfc4a946..993bb321a25 100644
--- a/service/worker/scheduler/workflow_test.go
+++ b/service/worker/scheduler/workflow_test.go
@@ -1477,8 +1477,6 @@ func (s *workflowSuite) TestLotsOfIterations() {
 }
 
 func (s *workflowSuite) TestExitScheduleWorkflowWhenNoActions() {
-	s.T().Skip("re-enable later")
-
 	scheduleId := "myschedule"
 	s.expectStart(func(req *schedspb.StartWorkflowRequest) (*schedspb.StartWorkflowResponse, error) {
 		s.True(time.Date(2022, 6, 1, 0, 15, 0, 0, time.UTC).Equal(s.now()))
@@ -1525,8 +1523,6 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenNoActions() {
 }
 
 func (s *workflowSuite) TestExitScheduleWorkflowWhenNoNextTime() {
-	s.T().Skip("re-enable later")
-
 	scheduleId := "myschedule"
 	s.expectStart(func(req *schedspb.StartWorkflowRequest) (*schedspb.StartWorkflowResponse, error) {
 		s.True(time.Date(2022, 6, 1, 1, 0, 0, 0, time.UTC).Equal(s.now()))
@@ -1563,8 +1559,6 @@ func (s *workflowSuite) TestExitScheduleWorkflowWhenNoNextTime() {
 }
 
 func (s *workflowSuite) TestExitScheduleWorkflowWhenEmpty() {
-	s.T().Skip("re-enable later")
-
 	scheduleId := "myschedule"
 
 	currentTweakablePolicies.IterationsBeforeContinueAsNew = 3
diff --git a/tests/schedule_test.go b/tests/schedule_test.go
index b70d43f7b24..1f018abf033 100644
--- a/tests/schedule_test.go
+++ b/tests/schedule_test.go
@@ -816,8 +816,6 @@ func (s *scheduleIntegrationSuite) TestRateLimit() {
 }
 
 func (s *scheduleIntegrationSuite) TestNextTimeCache() {
-	s.T().Skip("re-enable after enabling new cache")
-
 	sid := "sched-test-next-time-cache"
 	wid := "sched-test-next-time-cache-wf"
 	wt := "sched-test-next-time-cache-wt"