diff --git a/tsdb/engine/tsm1/compact.go b/tsdb/engine/tsm1/compact.go
index 51b98f6c25..b89ea3fc02 100644
--- a/tsdb/engine/tsm1/compact.go
+++ b/tsdb/engine/tsm1/compact.go
@@ -573,16 +573,12 @@ func (c *Compactor) write(path string, iter KeyIterator) (err error) {
 		}
 
 		// Write the key and value
-		err = w.WriteBlock(key, minTime, maxTime, block)
-		if err == ErrMaxBlocksExceeded {
+		if err := w.WriteBlock(key, minTime, maxTime, block); err == ErrMaxBlocksExceeded {
 			if err := w.WriteIndex(); err != nil {
 				return err
 			}
-
-			return ErrMaxBlocksExceeded
-		}
-
-		if err != nil {
+			return err
+		} else if err != nil {
 			return err
 		}
 
@@ -888,7 +884,7 @@ func (k *tsmKeyIterator) combine(dedup bool) blocks {
 				// Filter out only the values for overlapping block
 				v = Values(v).Include(first.minTime, first.maxTime)
 				if len(v) > 0 {
-					// Recoder that we read a subset of the block
+					// Record that we read a subset of the block
 					k.blocks[i].markRead(v[0].UnixNano(), v[len(v)-1].UnixNano())
 				}
 
diff --git a/tsdb/engine/tsm1/compact_test.go b/tsdb/engine/tsm1/compact_test.go
index a5ca68c003..56f683a1dc 100644
--- a/tsdb/engine/tsm1/compact_test.go
+++ b/tsdb/engine/tsm1/compact_test.go
@@ -566,7 +566,7 @@ func TestCompactor_CompactFull_TombstonedMultipleRanges(t *testing.T) {
 // max keys per blocks is exceeded
 func TestCompactor_CompactFull_MaxKeys(t *testing.T) {
 	// This test creates a lot of data and causes timeout failures for these envs
-	if testing.Short() || os.Getenv("CIRCLECI") != "" || os.Getenv("APPVEYOR") != "" || os.Getenv("GORACE") != "" {
+	if testing.Short() || os.Getenv("CI") != "" || os.Getenv("GORACE") != "" {
 		t.Skip("Skipping max keys compaction test")
 	}
 	dir := MustTempDir()