diff --git a/app/assets/javascripts/repository/file_tree_browser/components/tree_list.vue b/app/assets/javascripts/repository/file_tree_browser/components/tree_list.vue
index 39e9d61f01dafc7e1a1386b9e8a498ee9c031e07..0bf536f0e332519a70f3091664d0691cafe93747 100644
--- a/app/assets/javascripts/repository/file_tree_browser/components/tree_list.vue
+++ b/app/assets/javascripts/repository/file_tree_browser/components/tree_list.vue
@@ -398,6 +398,7 @@ export default {
             :level="item.level"
             :opened="item.opened"
             :loading="item.loading"
+            :tabindex="item.loading ? -1 : 0"
             :aria-current="isCurrentPath(item.path)"
             :style="{ '--level': item.level }"
             :class="{
diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue
index 4e7ce05f34ef8523c8e6813db6495968184d7662..e068155840294155963ade97af3a007d95353813 100644
--- a/app/assets/javascripts/vue_shared/components/file_row.vue
+++ b/app/assets/javascripts/vue_shared/components/file_row.vue
@@ -147,6 +147,7 @@ export default {
     :data-level="level"
     class="file-row"
     :aria-expanded="file.type === 'tree' ? file.opened.toString() : undefined"
+    :aria-label="file.name"
     @click="clickFile"
   >
     <span
diff --git a/spec/features/projects/repository/file_tree_browser_spec.rb b/spec/features/projects/repository/file_tree_browser_spec.rb
index 1281536fcea6f4e8e1b70ec67e9d1786ac2a7763..7374ba0af2220bcfa72397d949e3aed75bc86294 100644
--- a/spec/features/projects/repository/file_tree_browser_spec.rb
+++ b/spec/features/projects/repository/file_tree_browser_spec.rb
@@ -35,6 +35,10 @@
       end
     end
 
+    it 'passes axe automated accessibility testing' do
+      expect(page).to be_axe_clean.within('.file-tree-browser')
+    end
+
     it 'navigates to a file' do
       within('.file-tree-browser') do
         click_file('README.md')
@@ -59,14 +63,14 @@
 
       within('.file-tree-browser') do
         # Should auto-expand parent directories
-        files_folder = find('[aria-label="files"]').ancestor('.file-row')
+        files_folder = find_button('files')
         expect(files_folder[:class]).to include('is-open')
 
-        ruby_folder = find('[aria-label="ruby"]').ancestor('.file-row')
+        ruby_folder = find_button('ruby')
         expect(ruby_folder[:class]).to include('is-open')
 
         # Should highlight the current file
-        popen_row = find('[aria-label="popen.rb"]').ancestor('.file-row')
+        popen_row = find_button('popen.rb')
         expect(popen_row['aria-current']).to eq('true')
       end
     end
@@ -121,11 +125,11 @@
   private
 
   def click_file(name)
-    find("[aria-label=\"#{name}\"]").click
+    find(".file-row[aria-label=\"#{name}\"]").click
     wait_for_requests
   end
 
   def have_file(name)
-    have_css("[aria-label=\"#{name}\"]")
+    have_css(".file-row[aria-label=\"#{name}\"]")
   end
 end
diff --git a/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue b/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
index ea3c5aa12c1a3bfc24c5f6600c0fde7288e3250b..b11eee8385665e9e1dac166e3e8a2cbb85e79f88 100644
--- a/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
+++ b/vendor/assets/javascripts/vue-virtual-scroller/src/components/RecycleScroller.vue
@@ -22,6 +22,7 @@
       ref="wrapper"
       :style="{ [direction === 'vertical' ? 'minHeight' : 'minWidth']: totalSize + 'px' }"
       class="vue-recycle-scroller__item-wrapper"
+      role="tree"
     >
       <div
         v-for="view of pool"
@@ -32,6 +33,9 @@
           left: !useTransform && direction !== 'vertical' ? `${view.position}px` : null,
         } : null"
         class="vue-recycle-scroller__item-view"
+        role="treeitem"
+        :aria-setsize="items.length"
+        :aria-posinset="view.nr.index + 1"
         :class="{ hover: hoverKey === view.nr.key, 'will-change-transform': useTransform }"
         @mouseenter="hoverKey = view.nr.key"
         @mouseleave="hoverKey = null"