diff --git a/.rubocop.yml b/.rubocop.yml
index 4c6438f8b0d78da3612c41b15ef299162a082538..c674cfbcf51909d195668fe0dac798e1b8530bd5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -907,6 +907,10 @@ RSpec/RepeatedDescription:
 
 RSpec/SubjectStub:
   Enabled: false
+
+Lint/UnifiedInteger:
+  Enabled: true
+
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ca80e9c3f205feadcde76f46ee9ac87e59df7017..b18adcc8b2f74366839e17696f36987999e29e73 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,16 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 10
-# Cop supports --auto-correct.
-Lint/UnifiedInteger:
-  Exclude:
-    - 'spec/lib/gitlab/metrics/method_call_spec.rb'
-    - 'spec/lib/gitlab/metrics/metric_spec.rb'
-    - 'spec/lib/gitlab/metrics/system_spec.rb'
-    - 'spec/lib/gitlab/metrics/transaction_spec.rb'
-    - 'spec/models/repository_spec.rb'
-
 # Offense count: 23
 # Cop supports --auto-correct.
 Lint/UnneededSplatExpansion:
diff --git a/spec/lib/gitlab/metrics/method_call_spec.rb b/spec/lib/gitlab/metrics/method_call_spec.rb
index 8d05081eecbce700006d2265264f1bb574b0a21d..16c6de0bee6dab05cd68e9cb4d46256488536ff3 100644
--- a/spec/lib/gitlab/metrics/method_call_spec.rb
+++ b/spec/lib/gitlab/metrics/method_call_spec.rb
@@ -23,7 +23,7 @@ describe Gitlab::Metrics::MethodCall do
 
       expect(metric.values[:duration]).to be_a_kind_of(Numeric)
       expect(metric.values[:cpu_duration]).to be_a_kind_of(Numeric)
-      expect(metric.values[:call_count]).to an_instance_of(Fixnum)
+      expect(metric.values[:call_count]).to an_instance_of(Integer)
 
       expect(metric.tags).to eq({ method: 'Foo#bar' })
     end
diff --git a/spec/lib/gitlab/metrics/metric_spec.rb b/spec/lib/gitlab/metrics/metric_spec.rb
index f26fca52c5067a77d0d7679fc6fabc802ee462a0..b4d29ebe05f0d6b9166251f7638dd15638f79f96 100644
--- a/spec/lib/gitlab/metrics/metric_spec.rb
+++ b/spec/lib/gitlab/metrics/metric_spec.rb
@@ -62,7 +62,7 @@ describe Gitlab::Metrics::Metric do
       end
 
       it 'includes the timestamp' do
-        expect(hash[:timestamp]).to be_an_instance_of(Fixnum)
+        expect(hash[:timestamp]).to be_an_instance_of(Integer)
       end
     end
   end
diff --git a/spec/lib/gitlab/metrics/system_spec.rb b/spec/lib/gitlab/metrics/system_spec.rb
index 9e2ea89a712a0733b77b6e39a266efcad695637f..a7b129e2827c2d8fa3b3580cb23a5f28a2796917 100644
--- a/spec/lib/gitlab/metrics/system_spec.rb
+++ b/spec/lib/gitlab/metrics/system_spec.rb
@@ -29,19 +29,19 @@ describe Gitlab::Metrics::System do
 
   describe '.cpu_time' do
     it 'returns a Fixnum' do
-      expect(described_class.cpu_time).to be_an_instance_of(Fixnum)
+      expect(described_class.cpu_time).to be_an_instance_of(Integer)
     end
   end
 
   describe '.real_time' do
     it 'returns a Fixnum' do
-      expect(described_class.real_time).to be_an_instance_of(Fixnum)
+      expect(described_class.real_time).to be_an_instance_of(Integer)
     end
   end
 
   describe '.monotonic_time' do
     it 'returns a Fixnum' do
-      expect(described_class.monotonic_time).to be_an_instance_of(Fixnum)
+      expect(described_class.monotonic_time).to be_an_instance_of(Integer)
     end
   end
 end
diff --git a/spec/lib/gitlab/metrics/transaction_spec.rb b/spec/lib/gitlab/metrics/transaction_spec.rb
index 3887c04c83214b19f531523afd6e646e0c3104f1..83bd862d1460f4312a6302edcece375ca7d6fade 100644
--- a/spec/lib/gitlab/metrics/transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/transaction_spec.rb
@@ -134,7 +134,7 @@ describe Gitlab::Metrics::Transaction do
         series:    'rails_transactions',
         tags:      { action: 'Foo#bar' },
         values:    { duration: 0.0, allocated_memory: a_kind_of(Numeric) },
-        timestamp: an_instance_of(Fixnum)
+        timestamp: an_instance_of(Integer)
       }
 
       expect(Gitlab::Metrics).to receive(:submit_metrics).
@@ -151,7 +151,7 @@ describe Gitlab::Metrics::Transaction do
         series:    'events',
         tags:      { event: :meow },
         values:    { count: 1 },
-        timestamp: an_instance_of(Fixnum)
+        timestamp: an_instance_of(Integer)
       }
 
       expect(Gitlab::Metrics).to receive(:submit_metrics).
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 0d1db97cd5b9c6998025b42f886b02ba52ab21c1..c3d4365639d8522222146f2074fa14e04bcc1eca 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1382,13 +1382,13 @@ describe Repository, models: true do
 
   describe '#branch_count' do
     it 'returns the number of branches' do
-      expect(repository.branch_count).to be_an_instance_of(Fixnum)
+      expect(repository.branch_count).to be_an_instance_of(Integer)
     end
   end
 
   describe '#tag_count' do
     it 'returns the number of tags' do
-      expect(repository.tag_count).to be_an_instance_of(Fixnum)
+      expect(repository.tag_count).to be_an_instance_of(Integer)
     end
   end
 
@@ -1738,7 +1738,7 @@ describe Repository, models: true do
 
     context 'with an existing repository' do
       it 'returns the commit count' do
-        expect(repository.commit_count).to be_an_instance_of(Fixnum)
+        expect(repository.commit_count).to be_an_instance_of(Integer)
       end
     end
   end