diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 659cfce653..808c097c58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -156,6 +156,10 @@ jobs:
       run: |
         cargo test --test default --no-default-features --features 'std pattern unicode-perl'
 
+    - if: matrix.build == 'nightly'
+      name: Run marker-traits tests
+      run: ./scripts/public-types-tests.py
+
   rustfmt:
     name: rustfmt
     runs-on: ubuntu-18.04
diff --git a/scripts/public-types-tests.py b/scripts/public-types-tests.py
new file mode 100755
index 0000000000..436b99e66e
--- /dev/null
+++ b/scripts/public-types-tests.py
@@ -0,0 +1,175 @@
+#!/usr/bin/env python3
+
+from subprocess import run
+import argparse
+import datetime
+import json
+import os
+
+PREAMBLE = """
+// DO NOT EDIT. Automatically generated by 'scripts/public-types-tests.py'
+// on {date}.
+""".lstrip()
+
+CMD = [
+    "cargo",
+    "rustdoc",
+    "-q",
+    "--",
+    "-Z",
+    "unstable-options",
+    "--output-format",
+    "json",
+]
+
+def gen_docs():
+    """Runs the command to retrieve the docs of this crate.
+
+    If the command fails, the script exits.
+    """
+    doc_gen_result = run(CMD)
+    if doc_gen_result.returncode != 0:
+        print("Unable to generate the docs for the regex")
+        exit(1)
+
+
+def get_public_of_kind(kinds, elements, docs):
+    """Gets the items that are of some kind in the public API.
+
+    `kinds` is a list of item kinds. Ex: ["module", "struct"]
+    `elements` are the keys in the docs json schema to search in.
+    `docs` is usually the slice of the json tree that we care about.
+    """
+    keys_of_kind = filter(lambda key: docs[key]["kind"] in kinds, elements)
+    public_of_kind = filter(
+        lambda key: docs[key]["visibility"] == "public", keys_of_kind
+    )
+    return map(lambda key: docs[key], public_of_kind)
+
+
+def gen_test(path):
+    """Generates 4 valid lines of Rust code that assert marker traits on a type.
+
+    `path` is a fully qualified type. Ex: regex::bytes::Regex
+    """
+    tests = [
+        f"\tassert_send::<{path}>();",
+        f"\tassert_sync::<{path}>();",
+        f"\tassert_unwind_safe::<{path}>();",
+        f"\tassert_ref_unwind_safe::<{path}>();",
+        "",
+    ]
+    return "\n".join(tests)
+
+
+def get_public_types():
+    """Reads the public types from the json dump of the docs of this crate.
+
+    After generating the docs, this function is used to read the dump in
+    json format located at target/doc/regex.json. Then, it generates the
+    fully qualified paths for each type of the public API of the crate.
+    """
+    with open(os.path.join("target", "doc", "regex.json")) as docs_file:
+        docs = json.load(docs_file)
+        index = docs["index"]
+
+        type_paths = []
+        public_modules = get_public_of_kind(["module"], index.keys(), index)
+        for mod in public_modules:
+            types = get_public_of_kind(["struct"], mod["inner"]["items"], index)
+            for type in types:
+                prefix = "" if mod["inner"]["is_crate"] else "regex::"
+                type_path = f"{prefix}{mod['name']}::{type['name']}"
+                type_paths.append(type_path)
+
+        return type_paths
+
+
+def gen_tests():
+    tests = []
+    types = get_public_types()
+    for type in types:
+        tests.append("")
+        test = gen_test(type)
+        tests.append(test)
+
+    return tests
+
+
+def get_assert_definitions():
+    """Generates the definitions of the assert functions we use to test marker
+    traits."""
+    definitions = [
+        "\tfn assert_send<T: Send>() {}",
+        "\tfn assert_sync<T: Sync>() {}",
+        "\tfn assert_unwind_safe<T: UnwindSafe>() {}",
+        "\tfn assert_ref_unwind_safe<T: RefUnwindSafe>() {}",
+    ]
+    return "\n".join(definitions)
+
+
+def write_tests():
+    """Writes the generated tests to the tests/marker_traits.rs file."""
+    with open(os.path.join("tests", "marker_traits.rs"), "w") as f:
+        f.write(PREAMBLE.format(date=str(datetime.datetime.now())))
+        f.write("\n")
+        f.write("#[test]\nfn marker_traits() {\n")
+        f.write("\tuse std::panic::{RefUnwindSafe, UnwindSafe};\n")
+        f.write("\n")
+        f.write(get_assert_definitions())
+        f.write("\n")
+        for test in gen_tests():
+            f.write(f"{test}\n")
+        f.write("}\n")
+
+
+def check_existence():
+    """Fails the script when a type in the API doesn't have a corresponding marker trait test
+    in the tests/marker_traits.rs file."""
+    types = get_public_types()
+    test_path = os.path.join("tests", "marker_traits.rs")
+    with open(test_path ) as f:
+        lines = f.readlines()
+        for type in types:
+            if any(type in line for line in lines):
+                continue
+            else:
+                print("Failed check!\n")
+                print(f"A marker trait test for {type} was not found in {test_path}.")
+                exit(1)
+
+    print("Success!\nThe existence check found that every type has a corresponding test.")
+    exit(0)
+
+
+def main():
+    p = argparse.ArgumentParser(
+        "A script to manage marker-traits tests.",
+        description="Checks for the existence of tests for the public API types, "
+        "failing when there are missing tests for a marker trait of "
+        "a type.",
+    )
+    p.add_argument(
+        "-g",
+        "--generate-tests",
+        action="store_true",
+        help=(
+            "If set, the script will generate a "
+            "tests/marker_traits.rs file containing a test that "
+            "checks the auto traits of the public API types "
+            "(These tests might need to be updated after generating them)."
+        ),
+    )
+
+    args = p.parse_args()
+
+    gen_docs()
+
+    if args.generate_tests:
+        write_tests()
+    else:
+        check_existence()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/dfa.rs b/src/dfa.rs
index 4aee8039c6..27e610a2ac 100644
--- a/src/dfa.rs
+++ b/src/dfa.rs
@@ -31,7 +31,7 @@ considerably more complex than one might expect out of a DFA. A number of
 tricks are employed to make it fast. Tread carefully.
 
 N.B. While this implementation is heavily commented, Russ Cox's series of
-articles on regexes is strongly recommended: https://swtch.com/~rsc/regexp/
+articles on regexes is strongly recommended: <https://swtch.com/~rsc/regexp/>
 (As is the DFA implementation in RE2, which heavily influenced this
 implementation.)
 */
diff --git a/tests/marker_traits.rs b/tests/marker_traits.rs
new file mode 100644
index 0000000000..4da11ad4cc
--- /dev/null
+++ b/tests/marker_traits.rs
@@ -0,0 +1,182 @@
+// DO NOT EDIT. Automatically generated by 'scripts/public-types-tests.py'
+// on 2021-07-03 18:47:26.528306.
+
+#[test]
+fn marker_traits() {
+    use std::panic::{RefUnwindSafe, UnwindSafe};
+
+    fn assert_send<T: Send>() {}
+    fn assert_sync<T: Sync>() {}
+    fn assert_unwind_safe<T: UnwindSafe>() {}
+    fn assert_ref_unwind_safe<T: RefUnwindSafe>() {}
+
+    assert_send::<regex::bytes::RegexBuilder>();
+    assert_sync::<regex::bytes::RegexBuilder>();
+    assert_unwind_safe::<regex::bytes::RegexBuilder>();
+    assert_ref_unwind_safe::<regex::bytes::RegexBuilder>();
+
+    assert_send::<regex::bytes::RegexSetBuilder>();
+    assert_sync::<regex::bytes::RegexSetBuilder>();
+    assert_unwind_safe::<regex::bytes::RegexSetBuilder>();
+    assert_ref_unwind_safe::<regex::bytes::RegexSetBuilder>();
+
+    assert_send::<regex::bytes::Match>();
+    assert_sync::<regex::bytes::Match>();
+    assert_unwind_safe::<regex::bytes::Match>();
+    assert_ref_unwind_safe::<regex::bytes::Match>();
+
+    assert_send::<regex::bytes::Regex>();
+    assert_sync::<regex::bytes::Regex>();
+    assert_unwind_safe::<regex::bytes::Regex>();
+    assert_ref_unwind_safe::<regex::bytes::Regex>();
+
+    assert_send::<regex::bytes::Matches>();
+    assert_unwind_safe::<regex::bytes::Matches>();
+    assert_ref_unwind_safe::<regex::bytes::Matches>();
+
+    assert_send::<regex::bytes::CaptureMatches>();
+    assert_unwind_safe::<regex::bytes::CaptureMatches>();
+    assert_ref_unwind_safe::<regex::bytes::CaptureMatches>();
+
+    assert_send::<regex::bytes::Split>();
+    assert_unwind_safe::<regex::bytes::Split>();
+    assert_ref_unwind_safe::<regex::bytes::Split>();
+
+    assert_send::<regex::bytes::SplitN>();
+    assert_unwind_safe::<regex::bytes::SplitN>();
+    assert_ref_unwind_safe::<regex::bytes::SplitN>();
+
+    assert_send::<regex::bytes::CaptureNames>();
+    assert_sync::<regex::bytes::CaptureNames>();
+    assert_unwind_safe::<regex::bytes::CaptureNames>();
+    assert_ref_unwind_safe::<regex::bytes::CaptureNames>();
+
+    assert_send::<regex::bytes::CaptureLocations>();
+    assert_sync::<regex::bytes::CaptureLocations>();
+    assert_unwind_safe::<regex::bytes::CaptureLocations>();
+    assert_ref_unwind_safe::<regex::bytes::CaptureLocations>();
+
+    assert_send::<regex::bytes::Captures>();
+    assert_sync::<regex::bytes::Captures>();
+    assert_unwind_safe::<regex::bytes::Captures>();
+    assert_ref_unwind_safe::<regex::bytes::Captures>();
+
+    assert_send::<regex::bytes::SubCaptureMatches>();
+    assert_sync::<regex::bytes::SubCaptureMatches>();
+    assert_unwind_safe::<regex::bytes::SubCaptureMatches>();
+    assert_ref_unwind_safe::<regex::bytes::SubCaptureMatches>();
+
+    assert_send::<regex::bytes::ReplacerRef<[u8]>>();
+    assert_sync::<regex::bytes::ReplacerRef<[u8]>>();
+    assert_ref_unwind_safe::<regex::bytes::ReplacerRef<[u8]>>();
+
+    assert_send::<regex::bytes::NoExpand>();
+    assert_sync::<regex::bytes::NoExpand>();
+    assert_unwind_safe::<regex::bytes::NoExpand>();
+    assert_ref_unwind_safe::<regex::bytes::NoExpand>();
+
+    assert_send::<regex::bytes::RegexSet>();
+    assert_sync::<regex::bytes::RegexSet>();
+    assert_unwind_safe::<regex::bytes::RegexSet>();
+    assert_ref_unwind_safe::<regex::bytes::RegexSet>();
+
+    assert_send::<regex::bytes::SetMatches>();
+    assert_sync::<regex::bytes::SetMatches>();
+    assert_unwind_safe::<regex::bytes::SetMatches>();
+    assert_ref_unwind_safe::<regex::bytes::SetMatches>();
+
+    assert_send::<regex::bytes::SetMatchesIntoIter>();
+    assert_sync::<regex::bytes::SetMatchesIntoIter>();
+    assert_unwind_safe::<regex::bytes::SetMatchesIntoIter>();
+    assert_ref_unwind_safe::<regex::bytes::SetMatchesIntoIter>();
+
+    assert_send::<regex::bytes::SetMatchesIter>();
+    assert_sync::<regex::bytes::SetMatchesIter>();
+    assert_unwind_safe::<regex::bytes::SetMatchesIter>();
+    assert_ref_unwind_safe::<regex::bytes::SetMatchesIter>();
+
+    assert_send::<regex::RegexSetBuilder>();
+    assert_sync::<regex::RegexSetBuilder>();
+    assert_unwind_safe::<regex::RegexSetBuilder>();
+    assert_ref_unwind_safe::<regex::RegexSetBuilder>();
+
+    assert_send::<regex::RegexBuilder>();
+    assert_sync::<regex::RegexBuilder>();
+    assert_unwind_safe::<regex::RegexBuilder>();
+    assert_ref_unwind_safe::<regex::RegexBuilder>();
+
+    assert_send::<regex::RegexSet>();
+    assert_sync::<regex::RegexSet>();
+    assert_unwind_safe::<regex::RegexSet>();
+    assert_ref_unwind_safe::<regex::RegexSet>();
+
+    assert_send::<regex::SetMatches>();
+    assert_sync::<regex::SetMatches>();
+    assert_unwind_safe::<regex::SetMatches>();
+    assert_ref_unwind_safe::<regex::SetMatches>();
+
+    assert_send::<regex::SetMatchesIntoIter>();
+    assert_sync::<regex::SetMatchesIntoIter>();
+    assert_unwind_safe::<regex::SetMatchesIntoIter>();
+    assert_ref_unwind_safe::<regex::SetMatchesIntoIter>();
+
+    assert_send::<regex::SetMatchesIter>();
+    assert_sync::<regex::SetMatchesIter>();
+    assert_unwind_safe::<regex::SetMatchesIter>();
+    assert_ref_unwind_safe::<regex::SetMatchesIter>();
+
+    assert_send::<regex::CaptureLocations>();
+    assert_sync::<regex::CaptureLocations>();
+    assert_unwind_safe::<regex::CaptureLocations>();
+    assert_ref_unwind_safe::<regex::CaptureLocations>();
+
+    assert_send::<regex::CaptureMatches>();
+    assert_unwind_safe::<regex::CaptureMatches>();
+    assert_ref_unwind_safe::<regex::CaptureMatches>();
+
+    assert_send::<regex::CaptureNames>();
+    assert_sync::<regex::CaptureNames>();
+    assert_unwind_safe::<regex::CaptureNames>();
+    assert_ref_unwind_safe::<regex::CaptureNames>();
+
+    assert_send::<regex::Captures>();
+    assert_sync::<regex::Captures>();
+    assert_unwind_safe::<regex::Captures>();
+    assert_ref_unwind_safe::<regex::Captures>();
+
+    assert_send::<regex::Match>();
+    assert_sync::<regex::Match>();
+    assert_unwind_safe::<regex::Match>();
+    assert_ref_unwind_safe::<regex::Match>();
+
+    assert_send::<regex::Matches>();
+    assert_unwind_safe::<regex::Matches>();
+    assert_ref_unwind_safe::<regex::Matches>();
+
+    assert_send::<regex::NoExpand>();
+    assert_sync::<regex::NoExpand>();
+    assert_unwind_safe::<regex::NoExpand>();
+    assert_ref_unwind_safe::<regex::NoExpand>();
+
+    assert_send::<regex::Regex>();
+    assert_sync::<regex::Regex>();
+    assert_unwind_safe::<regex::Regex>();
+    assert_ref_unwind_safe::<regex::Regex>();
+
+    assert_send::<regex::ReplacerRef<[u8]>>();
+    assert_sync::<regex::ReplacerRef<[u8]>>();
+    assert_ref_unwind_safe::<regex::ReplacerRef<[u8]>>();
+
+    assert_send::<regex::Split>();
+    assert_unwind_safe::<regex::Split>();
+    assert_ref_unwind_safe::<regex::Split>();
+
+    assert_send::<regex::SplitN>();
+    assert_unwind_safe::<regex::SplitN>();
+    assert_ref_unwind_safe::<regex::SplitN>();
+
+    assert_send::<regex::SubCaptureMatches>();
+    assert_sync::<regex::SubCaptureMatches>();
+    assert_unwind_safe::<regex::SubCaptureMatches>();
+    assert_ref_unwind_safe::<regex::SubCaptureMatches>();
+}
diff --git a/tests/test_default.rs b/tests/test_default.rs
index d4365fbb34..454ff56c61 100644
--- a/tests/test_default.rs
+++ b/tests/test_default.rs
@@ -44,6 +44,7 @@ mod api_str;
 mod crazy;
 mod flags;
 mod fowler;
+mod marker_traits;
 mod misc;
 mod multiline;
 mod noparse;
@@ -79,54 +80,6 @@ fn allow_octal() {
     assert!(regex::RegexBuilder::new(r"\0").octal(true).build().is_ok());
 }
 
-#[test]
-fn oibits() {
-    use regex::bytes;
-    use regex::{Regex, RegexBuilder, RegexSet, RegexSetBuilder};
-    use std::panic::{RefUnwindSafe, UnwindSafe};
-
-    fn assert_send<T: Send>() {}
-    fn assert_sync<T: Sync>() {}
-    fn assert_unwind_safe<T: UnwindSafe>() {}
-    fn assert_ref_unwind_safe<T: RefUnwindSafe>() {}
-
-    assert_send::<Regex>();
-    assert_sync::<Regex>();
-    assert_unwind_safe::<Regex>();
-    assert_ref_unwind_safe::<Regex>();
-    assert_send::<RegexBuilder>();
-    assert_sync::<RegexBuilder>();
-    assert_unwind_safe::<RegexBuilder>();
-    assert_ref_unwind_safe::<RegexBuilder>();
-
-    assert_send::<bytes::Regex>();
-    assert_sync::<bytes::Regex>();
-    assert_unwind_safe::<bytes::Regex>();
-    assert_ref_unwind_safe::<bytes::Regex>();
-    assert_send::<bytes::RegexBuilder>();
-    assert_sync::<bytes::RegexBuilder>();
-    assert_unwind_safe::<bytes::RegexBuilder>();
-    assert_ref_unwind_safe::<bytes::RegexBuilder>();
-
-    assert_send::<RegexSet>();
-    assert_sync::<RegexSet>();
-    assert_unwind_safe::<RegexSet>();
-    assert_ref_unwind_safe::<RegexSet>();
-    assert_send::<RegexSetBuilder>();
-    assert_sync::<RegexSetBuilder>();
-    assert_unwind_safe::<RegexSetBuilder>();
-    assert_ref_unwind_safe::<RegexSetBuilder>();
-
-    assert_send::<bytes::RegexSet>();
-    assert_sync::<bytes::RegexSet>();
-    assert_unwind_safe::<bytes::RegexSet>();
-    assert_ref_unwind_safe::<bytes::RegexSet>();
-    assert_send::<bytes::RegexSetBuilder>();
-    assert_sync::<bytes::RegexSetBuilder>();
-    assert_unwind_safe::<bytes::RegexSetBuilder>();
-    assert_ref_unwind_safe::<bytes::RegexSetBuilder>();
-}
-
 // See: https://github.com/rust-lang/regex/issues/568
 #[test]
 fn oibits_regression() {