diff --git a/test/data/config/version=3.0.0-alpha1.yml b/test/data/config/version=3.0.0-alpha1.yml
index 4c5381bc9f..3533e91d95 100644
--- a/test/data/config/version=3.0.0-alpha1.yml
+++ b/test/data/config/version=3.0.0-alpha1.yml
@@ -39,6 +39,7 @@ listen_address: "java.lang.String"
 native_transport_max_concurrent_connections_per_ip: "java.lang.Long"
 rpc_keepalive: "java.lang.Boolean"
 request_scheduler: "java.lang.String"
+allow_extra_insecure_udfs: "java.lang.Boolean"
 rpc_interface_prefer_ipv6: "java.lang.Boolean"
 check_for_duplicate_rows_during_compaction: "java.lang.Boolean"
 request_timeout_in_ms: "java.lang.Long"
@@ -68,6 +69,7 @@ permissions_update_interval_in_ms: "java.lang.Integer"
 tombstone_failure_threshold: "java.lang.Integer"
 authenticator: "java.lang.String"
 max_mutation_size_in_kb: "java.lang.Integer"
+allow_insecure_udfs: "java.lang.Boolean"
 cache_load_timeout_seconds: "java.lang.Integer"
 initial_token: "java.lang.String"
 batch_size_warn_threshold_in_kb: "java.lang.Integer"
@@ -162,6 +164,7 @@ hints_compression:
   class_name: "java.lang.String"
   parameters: "java.util.Map"
 commitlog_periodic_queue_size: "java.lang.Integer"
+force_new_prepared_statement_behaviour: "java.lang.Boolean"
 hinted_handoff_enabled: "java.lang.Boolean"
 max_value_size_in_mb: "java.lang.Integer"
 memtable_flush_writers: "java.lang.Integer"
diff --git a/test/data/config/version=4.0-alpha1.yml b/test/data/config/version=4.0-alpha1.yml
index 2a0c58ee3e..70fdf76a5a 100644
--- a/test/data/config/version=4.0-alpha1.yml
+++ b/test/data/config/version=4.0-alpha1.yml
@@ -17,6 +17,7 @@ audit_logging_options:
   archive_command: "java.lang.String"
   included_keyspaces: "java.lang.String"
   max_log_size: "java.lang.Long"
+  allow_nodetool_archive_command: "java.lang.Boolean"
   block: "java.lang.Boolean"
   excluded_users: "java.lang.String"
   max_queue_weight: "java.lang.Integer"
@@ -55,6 +56,7 @@ full_query_logging_options:
   log_dir: "java.lang.String"
   archive_command: "java.lang.String"
   max_log_size: "java.lang.Long"
+  allow_nodetool_archive_command: "java.lang.Boolean"
   block: "java.lang.Boolean"
   roll_cycle: "java.lang.String"
   max_queue_weight: "java.lang.Integer"
@@ -119,6 +121,7 @@ allocate_tokens_for_keyspace: "java.lang.String"
 diagnostic_events_enabled: "java.lang.Boolean"
 storage_port: "java.lang.Integer"
 counter_cache_size_in_mb: "java.lang.Long"
+repair_request_timeout_in_ms: "java.lang.Long"
 dynamic_snitch_reset_interval_in_ms: "java.lang.Integer"
 tracetype_query_ttl: "java.lang.Integer"
 autocompaction_on_startup_enabled: "java.lang.Boolean"
diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatabilityTestGenerate.java b/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java
similarity index 89%
rename from test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatabilityTestGenerate.java
rename to test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java
index 518fd14564..737ad07022 100644
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatabilityTestGenerate.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/ConfigCompatibilityTestGenerate.java
@@ -30,14 +30,14 @@ import org.apache.cassandra.distributed.api.IInvokableInstance;
 import org.apache.cassandra.distributed.impl.AbstractCluster;
 import org.apache.cassandra.distributed.shared.Versions;
 
-import static org.apache.cassandra.config.ConfigCompatabilityTest.TEST_DIR;
-import static org.apache.cassandra.config.ConfigCompatabilityTest.dump;
-import static org.apache.cassandra.config.ConfigCompatabilityTest.toTree;
+import static org.apache.cassandra.config.ConfigCompatibilityTest.TEST_DIR;
+import static org.apache.cassandra.config.ConfigCompatibilityTest.dump;
+import static org.apache.cassandra.config.ConfigCompatibilityTest.toTree;
 
 /**
  * This class is to generate YAML dumps per version, this is a manual process and should be updated for each release.
  */
-public class ConfigCompatabilityTestGenerate
+public class ConfigCompatibilityTestGenerate
 {
     public static void main(String[] args) throws Throwable
     {
@@ -55,7 +55,7 @@ public class ConfigCompatabilityTestGenerate
             {
                 IInvokableInstance inst = (IInvokableInstance) cluster.get(1);
                 Class<?> klass = inst.callOnInstance(() -> Config.class);
-                assert klass.getClassLoader() != ConfigCompatabilityTestGenerate.class.getClassLoader();
+                assert klass.getClassLoader() != ConfigCompatibilityTestGenerate.class.getClassLoader();
                 dump(toTree(klass), path.getAbsolutePath());
             }
         }
diff --git a/test/unit/org/apache/cassandra/config/ConfigCompatabilityTest.java b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
similarity index 98%
rename from test/unit/org/apache/cassandra/config/ConfigCompatabilityTest.java
rename to test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
index 8d1e5e237e..3b8a5a1601 100644
--- a/test/unit/org/apache/cassandra/config/ConfigCompatabilityTest.java
+++ b/test/unit/org/apache/cassandra/config/ConfigCompatibilityTest.java
@@ -51,14 +51,15 @@ import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.apache.cassandra.distributed.upgrade.ConfigCompatibilityTestGenerate;
 import org.yaml.snakeyaml.introspector.Property;
 
 /**
- * To create the test files used by this class, run {@link org.apache.cassandra.distributed.upgrade.ConfigCompatabilityTestGenerate}.
+ * To create the test files used by this class, run {@link ConfigCompatibilityTestGenerate}.
  */
-public class ConfigCompatabilityTest
+public class ConfigCompatibilityTest
 {
-    private static final Logger logger = LoggerFactory.getLogger(ConfigCompatabilityTest.class);
+    private static final Logger logger = LoggerFactory.getLogger(ConfigCompatibilityTest.class);
 
     public static final String TEST_DIR = "test/data/config";