diff --git a/lib/puppet/application/device.rb b/lib/puppet/application/device.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/application/device.rb
+++ b/lib/puppet/application/device.rb
@@ -1,6 +1,7 @@
 require 'puppet/application'
 require 'puppet/configurer'
 require 'puppet/util/network_device'
+require 'puppet/ssl/oids'
 
 class Puppet::Application::Device < Puppet::Application
 
@@ -414,6 +415,8 @@ Licensed under the Apache 2.0 License
   def setup
     setup_logs
 
+    Puppet::SSL::Oids.register_puppet_oids
+
     # setup global device-specific defaults; creates all necessary directories, etc
     Puppet.settings.use :main, :agent, :device, :ssl
 
diff --git a/spec/unit/application/device_spec.rb b/spec/unit/application/device_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/application/device_spec.rb
+++ b/spec/unit/application/device_spec.rb
@@ -170,6 +170,12 @@ describe Puppet::Application::Device do
 
       device.handle_facts(true)
     end
+
+    it "should register ssl OIDs" do
+      expect(Puppet::SSL::Oids).to receive(:register_puppet_oids)
+
+      device.setup
+    end
   end
 
   describe "during setup" do
(PUP-<I>) Add SSL::Oids for device