diff --git a/.circleci/config.yml b/.circleci/config.yml
index b34d24c..b48daf2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,7 @@
 version: 2.1
 
 orbs:
-  redmine-plugin: agileware-jp/redmine-plugin@3.3.1
-  browser-tools: circleci/browser-tools@1.4.6
+  redmine-plugin: agileware-jp/redmine-plugin@3.6.0
 
 jobs:
   run_tests:
@@ -51,8 +50,6 @@ jobs:
       - run:
           working_directory: redmine
           command: touch Gemfile.local
-      - browser-tools/install-chrome
-      - browser-tools/install-chromedriver
       - redmine-plugin/bundle-install
       - redmine-plugin/test:
           plugin: view_customize
diff --git a/app/models/view_customize.rb b/app/models/view_customize.rb
index ce9e5d9..d77e05a 100644
--- a/app/models/view_customize.rb
+++ b/app/models/view_customize.rb
@@ -1,4 +1,4 @@
-class ViewCustomize < ActiveRecord::Base
+class ViewCustomize < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
   validates_length_of :path_pattern, :maximum => 255
diff --git a/init.rb b/init.rb
index a7bcffa..4da777f 100644
--- a/init.rb
+++ b/init.rb
@@ -3,7 +3,7 @@
   name 'View Customize plugin'
   author 'onozaty'
   description 'View Customize plugin for Redmine'
-  version '3.5.1'
+  version '3.5.2'
   url 'https://github.com/onozaty/redmine-view-customize'
   author_url 'https://github.com/onozaty'