diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index 74950af97667..c32d0390e0a9 100644
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -25,13 +25,15 @@
 
 # FIX FOR EXAMPLE REFERENCES
 REPO_ROOT = os.path.abspath(os.path.join(os.path.abspath(__file__), '..', '..', '..'))
-examples_glob_expansion = os.path.join(REPO_ROOT, 'sdk/*/*/examples/**/test*example*.py')
+examples_tests_glob_expansion = os.path.join(REPO_ROOT, 'sdk/*/*/examples/**/test*example*.py')
 samples_glob_expansion = os.path.join(REPO_ROOT, 'sdk/*/*/tests/**/test*sample*.py')
+test_examples_glob_expansion = os.path.join(REPO_ROOT, 'sdk/*/*/tests/**/test*example*.py')
 
-example_files = glob.glob(examples_glob_expansion, recursive=True)
+example_tests_files = glob.glob(examples_tests_glob_expansion, recursive=True)
+test_examples_files = glob.glob(test_examples_glob_expansion, recursive=True)
 samples_files = glob.glob(samples_glob_expansion, recursive=True)
 
-all_files = [os.path.relpath(file, REPO_ROOT) for file in list(set(example_files + samples_files))]
+all_files = [os.path.relpath(file, REPO_ROOT) for file in list(set(example_tests_files + test_examples_files + samples_files))]
 
 # now for each package, we need to copy it and write it to the relative path FROM THE CURRENT CWD
 for example_file in all_files:
diff --git a/doc/sphinx/ref/azure.keyvault.certificates.aio.rst b/doc/sphinx/ref/azure.keyvault.certificates.aio.rst
index 88bc45e1668d..04f7f950a54d 100644
--- a/doc/sphinx/ref/azure.keyvault.certificates.aio.rst
+++ b/doc/sphinx/ref/azure.keyvault.certificates.aio.rst
@@ -1,13 +1,13 @@
-certificates.aio package
+azure.keyvault.certificates.aio package
 ========================
 
 Submodules
 ----------
 
-certificates.aio.client module
+azure.keyvault.certificates.aio.client module
 ------------------------------
 
-.. automodule:: certificates.aio.client
+.. automodule:: azure.keyvault.certificates.aio.client
    :members:
    :undoc-members:
    :show-inheritance:
@@ -16,7 +16,7 @@ certificates.aio.client module
 Module contents
 ---------------
 
-.. automodule:: certificates.aio
+.. automodule:: azure.keyvault.certificates.aio
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/sphinx/ref/azure.keyvault.certificates.rst b/doc/sphinx/ref/azure.keyvault.certificates.rst
index 4a68ddfd11bb..a21ad9deed22 100644
--- a/doc/sphinx/ref/azure.keyvault.certificates.rst
+++ b/doc/sphinx/ref/azure.keyvault.certificates.rst
@@ -1,4 +1,4 @@
-certificates package
+azure.keyvault.certificates package
 ====================
 
 Subpackages
@@ -6,31 +6,31 @@ Subpackages
 
 .. toctree::
 
-   certificates.aio
+   azure.keyvault.certificates.aio
 
 Submodules
 ----------
 
-certificates.client module
+azure.keyvault.certificates.client module
 --------------------------
 
-.. automodule:: certificates.client
+.. automodule:: azure.keyvault.certificates.client
    :members:
    :undoc-members:
    :show-inheritance:
 
-certificates.enums module
+azure.keyvault.certificates.enums module
 -------------------------
 
-.. automodule:: certificates.enums
+.. automodule:: azure.keyvault.certificates.enums
    :members:
    :undoc-members:
    :show-inheritance:
 
-certificates.models module
+azure.keyvault.certificates.models module
 --------------------------
 
-.. automodule:: certificates.models
+.. automodule:: azure.keyvault.certificates.models
    :members:
    :undoc-members:
    :show-inheritance:
@@ -39,7 +39,7 @@ certificates.models module
 Module contents
 ---------------
 
-.. automodule:: certificates
+.. automodule:: azure.keyvault.certificates
    :members:
    :undoc-members:
    :show-inheritance: