diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index 44e47693d..77609857f 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -405,7 +405,7 @@ module SiteSettingExtension
     end
 
     define_singleton_method clean_name + "?" do
-      clean_name
+      self.send clean_name
     end
 
     define_singleton_method clean_name + "=" do |val|
diff --git a/spec/models/site_setting_spec.rb b/spec/models/site_setting_spec.rb
index 8e6445bfe..ced13c11f 100644
--- a/spec/models/site_setting_spec.rb
+++ b/spec/models/site_setting_spec.rb
@@ -83,7 +83,7 @@ describe SiteSetting do
   describe "scheme" do
 
     it "returns http when ssl is disabled" do
-      SiteSetting.expects(:use_https).returns(false)
+      SiteSetting.use_https = false
       expect(SiteSetting.scheme).to eq("http")
     end