diff --git a/docs/started.rst b/docs/started.rst
index 89aca6eedc..e6e91c189c 100644
--- a/docs/started.rst
+++ b/docs/started.rst
@@ -105,9 +105,13 @@ Enabling auto-completion
 
 .. versionadded:: 3.4.1
 
-You can enable auto-completion for ReFrame by sourcing in your shell the corresponding script in ``<install_prefix>/etc/reframe_completion.<shell>``.
+You can enable auto-completion for ReFrame by sourcing in your shell the corresponding script in ``<install_prefix>/share/completions/reframe.<shell>``.
 Auto-completion is supported for Bash, Tcsh and Fish shells.
 
+.. note::
+  .. versionchanged:: 3.4.2
+     The shell completion scripts have been moved under ``share/completions/``.
+
 
 
 Where to Go from Here
diff --git a/etc/reframe_completion.bash b/share/completions/reframe.bash
similarity index 100%
rename from etc/reframe_completion.bash
rename to share/completions/reframe.bash
diff --git a/etc/reframe_completion.fish b/share/completions/reframe.fish
similarity index 100%
rename from etc/reframe_completion.fish
rename to share/completions/reframe.fish
diff --git a/etc/reframe_completion.tcsh b/share/completions/reframe.tcsh
similarity index 100%
rename from etc/reframe_completion.tcsh
rename to share/completions/reframe.tcsh