diff --git a/app/controllers/fluentd/settings_controller.rb b/app/controllers/fluentd/settings_controller.rb
index aa8c3b2..7f3247a 100644
--- a/app/controllers/fluentd/settings_controller.rb
+++ b/app/controllers/fluentd/settings_controller.rb
@@ -69,7 +69,7 @@ class Fluentd::SettingsController < ApplicationController
 
   def parse_config(conf)
     # V1Parser.parse could raise exception
-    Fluent::Config::V1Parser.parse(conf, @fluentd.config_file)
+    Fluent::Config::V1Parser.parse(conf, @fluentd.config_file, File.dirname(@fluentd.config_file), binding)
   end
 
   def update_config(conf)
diff --git a/spec/features/setting_spec.rb b/spec/features/setting_spec.rb
index 0f28e3f..9f24335 100644
--- a/spec/features/setting_spec.rb
+++ b/spec/features/setting_spec.rb
@@ -82,12 +82,12 @@ describe 'setting', stub: :daemon do
 
       it 'configtest' do
         click_button I18n.t('terms.configtest')
-        page.should have_css('.alert-danger')
+        page.should have_css('.alert-success')
       end
 
       it "update & restart check" do
         click_button I18n.t('terms.update')
-        page.should have_css('.alert-danger')
+        daemon.agent.config.gsub("\r\n", "\n").should == conf # CodeMirror exchange \n -> \r\n
       end
     end
   end