diff --git a/app/controllers/admin/zonefiles_controller.rb b/app/controllers/admin/zonefiles_controller.rb
index 7a4e4b414..30b4b9a61 100644
--- a/app/controllers/admin/zonefiles_controller.rb
+++ b/app/controllers/admin/zonefiles_controller.rb
@@ -4,7 +4,7 @@ module Admin
     # TODO: Refactor this
 
     def create
-      if DNS::Zone.origins.include?(params[:origin])
+      if ::DNS::Zone.origins.include?(params[:origin])
 
         @zonefile = ActiveRecord::Base.connection.execute(
           "select generate_zonefile('#{params[:origin]}')"
diff --git a/spec/requests/admin/zonefiles/create_spec.rb b/spec/requests/admin/zonefiles/create_spec.rb
new file mode 100644
index 000000000..e9dfb62c8
--- /dev/null
+++ b/spec/requests/admin/zonefiles/create_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe 'Admin area zone file generation', settings: false do
+  let!(:zone) { create(:zone, origin: 'com') }
+
+  before do
+    sign_in_to_admin_area
+  end
+
+  it 'generates new' do
+    post admin_zonefiles_path(origin: 'com')
+    expect(response).to be_success
+  end
+end