diff --git a/tests/curl/conf.yml b/tests/curl/conf.yml
index e70f552..cdc68b8 100644
--- a/tests/curl/conf.yml
+++ b/tests/curl/conf.yml
@@ -1,30 +1,32 @@
 requirements:
-    ubuntu:
-        apt:
-            packages:
-                - libbrotli-dev
-                - libidn2-dev
-                - libldap2-dev
-                - libnghttp2-dev
-                - libpsl-dev
-                - librtmp-dev
-                - libzstd-dev
+  ubuntu:
+    apt:
+      packages:
+        - libbrotli-dev
+        - libidn2-dev
+        - libldap2-dev
+        - libnghttp2-dev
+        - libpsl-dev
+        - librtmp-dev
+        - libzstd-dev
 
 transpile:
-    autogen: true
-    # tflags: --reorganize-definitions
-    binary: tool_main
+  autogen: true
+  tflags: --reorganize-definitions --disable-refactoring
+  binary: tool_main
 
 refactor:
-    autogen: true
-    transforms:
-        - remove_unused_labels
-        - remove_literal_suffixes
-        - convert_cast_as_ptr
-        - remove_unnecessary_refs
+  autogen: true
+  transforms:
+    - rename_unnamed
+    - reorganize_definitions
+    - remove_unused_labels
+    - remove_literal_suffixes
+    - convert_cast_as_ptr
+    - remove_unnecessary_refs
 
 cargo.transpile:
-    autogen: true
+  autogen: true
 
 cargo.refactor:
-    autogen: true
+  autogen: true
diff --git a/tests/libmcs/conf.yml b/tests/libmcs/conf.yml
index a372ed4..fd106b0 100644
--- a/tests/libmcs/conf.yml
+++ b/tests/libmcs/conf.yml
@@ -1,9 +1,12 @@
 transpile:
   autogen: true
+  tflags: --reorganize-definitions --disable-refactoring
 
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_unused_labels
 
 cargo.transpile:
diff --git a/tests/libxml2/conf.yml b/tests/libxml2/conf.yml
index a742803..cc5bc51 100644
--- a/tests/libxml2/conf.yml
+++ b/tests/libxml2/conf.yml
@@ -19,6 +19,7 @@ refactor:
   - remove_unnecessary_refs
   - remove_literal_suffixes
   - noop
+
 cargo.transpile:
   autogen: true
 
diff --git a/tests/nginx/conf.yml b/tests/nginx/conf.yml
index 2571a4f..481c84a 100644
--- a/tests/nginx/conf.yml
+++ b/tests/nginx/conf.yml
@@ -5,6 +5,7 @@ requirements:
         - libgcrypt20
         - libpcre3-dev
         - zlib1g-dev
+
 cargo.transpile:
   autogen: true
 
@@ -13,13 +14,14 @@ cargo.refactor:
 
 transpile:
   autogen: true
-  # blocked on https://github.com/immunant/c2rust/issues/266
-  # tflags: --reorganize-definitions
+  tflags: --reorganize-definitions --disable-refactoring
   binary: nginx
 
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_unused_labels
     - remove_literal_suffixes
     - convert_cast_as_ptr
diff --git a/tests/python2/conf.yml b/tests/python2/conf.yml
index 771d294..81a6a1a 100644
--- a/tests/python2/conf.yml
+++ b/tests/python2/conf.yml
@@ -17,11 +17,14 @@ requirements:
 
 transpile:
   autogen: true
+  tflags: --reorganize-definitions --disable-refactoring
   binary: python
 
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_unused_labels
     - remove_literal_suffixes
     - convert_cast_as_ptr
diff --git a/tests/redis/conf.yml b/tests/redis/conf.yml
index 10ae337..16e8bb1 100644
--- a/tests/redis/conf.yml
+++ b/tests/redis/conf.yml
@@ -1,5 +1,6 @@
 transpile:
   autogen: true
+  tflags: --reorganize-definitions --disable-refactoring
   binary: redis-server
 
   # needs support for __atomic_*
@@ -8,6 +9,8 @@ transpile:
 refactor:
   autogen: true
   transforms:
+    - rename_unnamed
+    - reorganize_definitions
     - remove_literal_suffixes
     - convert_cast_as_ptr
     - remove_unnecessary_refs
diff --git a/tests/ruby/conf.yml b/tests/ruby/conf.yml
index d2a68bb..94e9ac3 100644
--- a/tests/ruby/conf.yml
+++ b/tests/ruby/conf.yml
@@ -11,7 +11,7 @@ transpile:
   autogen: true
   tflags: --reorganize-definitions --disable-refactoring
   binary: ruby
-#  cflags: "-O0"
+  # cflags: "-O0"
 
 refactor:
   autogen: true
diff --git a/tests/zstd/conf.yml b/tests/zstd/conf.yml
index b15efba..cbcceea 100644
--- a/tests/zstd/conf.yml
+++ b/tests/zstd/conf.yml
@@ -12,7 +12,7 @@ transpile:
 
 refactor:
   # TODO: re-enable once c2rust-refactor supports asm!
-  #autogen: true
+  # autogen: true
   transforms:
     - rename_unnamed
     - reorganize_definitions