diff --git a/app/views/dmsf/show.api.rsb b/app/views/dmsf/show.api.rsb
index 24a1aac8..45fd4ac2 100644
--- a/app/views/dmsf/show.api.rsb
+++ b/app/views/dmsf/show.api.rsb
@@ -21,6 +21,7 @@ api.dmsf do
     api.found_folder do
       api.id @folder.id
       api.title @folder.title
+      render_api_custom_values @folder.visible_custom_field_values, api
     end
   end
 
diff --git a/app/views/dmsf_files/show.api.rsb b/app/views/dmsf_files/show.api.rsb
index 04e57478..8068ef78 100644
--- a/app/views/dmsf_files/show.api.rsb
+++ b/app/views/dmsf_files/show.api.rsb
@@ -29,6 +29,7 @@ api.dmsf_file do
         api.dmsf_workflow_started_by_user_id r.dmsf_workflow_started_by_user_id
         api.dmsf_workflow_started_at r.dmsf_workflow_started_at
         api.digest r.digest
+        render_api_custom_values r.visible_custom_field_values, api
       end
     end
   end
diff --git a/test/integration/rest_api/dmsf_file_api_test.rb b/test/integration/rest_api/dmsf_file_api_test.rb
index eb32a3c0..d6551395 100644
--- a/test/integration/rest_api/dmsf_file_api_test.rb
+++ b/test/integration/rest_api/dmsf_file_api_test.rb
@@ -88,6 +88,11 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
     #       <dmsf_workflow_started_by_user_id>1</dmsf_workflow_started_by_user_id>
     #       <dmsf_workflow_started_at/>
     #       <digest>81dc9bdb52d04dc20036dbd8313ed055</digest>
+    #       <custom_fields>
+    #         <custom_field>
+    #           ...
+    #         <suctom_field>
+    #       </custom_fields>
     #     </dmsf_file_revision>
     #   </dmsf_file_revisions>
     # </dmsf_file>
@@ -97,6 +102,7 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
     assert_select 'dmsf_file > project_id', text: @file1.project_id.to_s
     assert_select 'dmsf_file > content_url', text: "http://www.example.com/dmsf/files/#{@file1.id}/download"
     assert_select 'dmsf_file > dmsf_file_revisions > dmsf_file_revision', @file1.dmsf_file_revisions.all.size
+    assert_select 'dmsf_file > dmsf_file_revisions > dmsf_file_revision > custom_fields > custom_field'
     #curl -v -H "Content-Type: application/octet-stream" -X GET -u ${1}:${2} http://localhost:3000/dmsf/files/41532/download > file.txt
     get "/dmsf/files/#{@file1.id}/download.xml?key=#{@token.value}"
     assert_response :success
diff --git a/test/integration/rest_api/dmsf_folder_api_test.rb b/test/integration/rest_api/dmsf_folder_api_test.rb
index 881c746c..68f9e060 100644
--- a/test/integration/rest_api/dmsf_folder_api_test.rb
+++ b/test/integration/rest_api/dmsf_folder_api_test.rb
@@ -168,10 +168,16 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     #   <found_folder>
     #     <id>1</id>
     #     <title>folder1</title>
+    #       <custom_fields>
+    #         <custom_field>
+    #           ...
+    #         <suctom_field>
+    #       </custom_fields>
     #   </found_folder>
     # </dmsf>
     assert_select 'dmsf > found_folder > id', text: @folder1.id.to_s
     assert_select 'dmsf > found_folder > title', text: @folder1.title
+    assert_select 'dmsf > found_folder > custom_fields > custom_field'
   end
 
   def test_find_folder_by_id_not_found