diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 762ab48a..3e5b7511 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Run other tests
         working-directory: tests
         run: |
-          tests=("command-line-options" "data-rep" "i18n_sjis" "jp-compat" "run" "syntax" "cobj-idx" "file-lock" "misc")
+          tests=("command-line-options" "data-rep" "i18n_sjis" "jp-compat" "run" "syntax" "cobj-idx" "file-lock" "file-lock2" "misc")
           for test in "${tests[@]}"; do
             ./"$test" || true
           done
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index a05afe2a..ba45db81 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -55,6 +55,7 @@ jobs:
           - "cobj-idx"
           - "misc"
           - "file-lock"
+          - "file-lock2"
         os: ["ubuntu:24.04", "almalinux:9", "amazonlinux:2023"]
     uses: ./.github/workflows/test-other.yml
     with:
@@ -76,6 +77,7 @@ jobs:
           - "syntax"
           - "cobj-idx"
           - "file-lock"
+          - "file-lock2"
           #- "misc"
         os: ["ubuntu:24.04", "almalinux:9", "amazonlinux:2023"]
     uses: ./.github/workflows/test-other.yml
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 76682b73..888cc5dd 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -59,6 +59,7 @@ jobs:
           - "syntax"
           - "cobj-idx"
           - "file-lock"
+          - "file-lock2"
           - "misc"
         os: ["ubuntu:24.04"]
     uses: ./.github/workflows/test-other.yml
@@ -80,7 +81,7 @@ jobs:
           - "run"
           - "syntax"
           - "cobj-idx"
-          - "file-lock"
+          - "file-lock2"
           #- "misc"
         os: ["ubuntu:24.04"]
     uses: ./.github/workflows/test-other.yml
diff --git a/.gitignore b/.gitignore
index cef26e9c..241a2495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,7 @@ tests/cobj-idx
 tests/misc
 tests/run
 tests/file-lock
+tests/file-lock2
 tests/*.log
 tests/syntax
 tests/cobol85/*/*.class
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b0d89750..efca9074 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,7 @@ TESTS = syntax \
 	command-line-options \
 	cobj-idx \
 	file-lock \
+	file-lock2 \
 	misc
 else
 TESTS = syntax \
@@ -43,6 +44,7 @@ TESTS = syntax \
 	command-line-options \
 	cobj-idx \
 	file-lock \
+	file-lock2 \
 	misc
 endif
 
@@ -212,15 +214,18 @@ indexed_lock_DEPENDENCIES = \
 	file-lock.at \
 	file-lock.src/lock-file.at \
 	file-lock.src/access-same-record.at \
-	file-lock.src/access-different-record.at \
-	file-lock.src/input-mode.at \
-	file-lock.src/same-process.at \
-	file-lock.src/open-start-write-rewrite.at \
-	file-lock.src/release-lock.at \
-	file-lock.src/open-input.at \
-	file-lock.src/lock-mode-clause.at \
-	file-lock.src/old-file.at \
-	file-lock.src/lock-mode-automatic.at
+	file-lock.src/access-different-record.at
+
+indexed_lock2_DEPENDENCIES = \
+	file-lock2.at \
+	file-lock2.src/input-mode.at \
+	file-lock2.src/same-process.at \
+	file-lock2.src/open-start-write-rewrite.at \
+	file-lock2.src/release-lock.at \
+	file-lock2.src/open-input.at \
+	file-lock2.src/lock-mode-clause.at \
+	file-lock2.src/old-file.at \
+	file-lock2.src/lock-mode-automatic.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \
@@ -308,4 +313,5 @@ $(srcdir)/jp-compat: $(jp_compat_DEPENDENCIES)
 $(srcdir)/command-line-options: $(command_line_options_DEPENDENCIES)
 $(srcdir)/cobj-idx: $(cobj_idx_DEPENDENCIES)
 $(srcdir)/file-lock: $(indexed_lock_DEPENDENCIES)
+$(srcdir)/file-lock2: $(indexed_lock2_DEPENDENCIES)
 $(srcdir)/misc: $(misc_DEPENDENCIES)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a6fe74f8..828cbbee 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -571,6 +571,7 @@ SUBDIRS = cobol85
 @I18N_UTF8_FALSE@	command-line-options \
 @I18N_UTF8_FALSE@	cobj-idx \
 @I18N_UTF8_FALSE@	file-lock \
+@I18N_UTF8_FALSE@	file-lock2 \
 @I18N_UTF8_FALSE@	misc
 
 @I18N_UTF8_TRUE@TESTS = syntax \
@@ -583,6 +584,7 @@ SUBDIRS = cobol85
 @I18N_UTF8_TRUE@	command-line-options \
 @I18N_UTF8_TRUE@	cobj-idx \
 @I18N_UTF8_TRUE@	file-lock \
+@I18N_UTF8_TRUE@	file-lock2 \
 @I18N_UTF8_TRUE@	misc
 
 syntax_DEPENDENCIES = \
@@ -751,15 +753,18 @@ indexed_lock_DEPENDENCIES = \
 	file-lock.at \
 	file-lock.src/lock-file.at \
 	file-lock.src/access-same-record.at \
-	file-lock.src/access-different-record.at \
-	file-lock.src/input-mode.at \
-	file-lock.src/same-process.at \
-	file-lock.src/open-start-write-rewrite.at \
-	file-lock.src/release-lock.at \
-	file-lock.src/open-input.at \
-	file-lock.src/lock-mode-clause.at \
-	file-lock.src/old-file.at \
-	file-lock.src/lock-mode-automatic.at
+	file-lock.src/access-different-record.at
+
+indexed_lock2_DEPENDENCIES = \
+	file-lock2.at \
+	file-lock2.src/input-mode.at \
+	file-lock2.src/same-process.at \
+	file-lock2.src/open-start-write-rewrite.at \
+	file-lock2.src/release-lock.at \
+	file-lock2.src/open-input.at \
+	file-lock2.src/lock-mode-clause.at \
+	file-lock2.src/old-file.at \
+	file-lock2.src/lock-mode-automatic.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \
@@ -1168,6 +1173,13 @@ file-lock.log: file-lock
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+file-lock2.log: file-lock2
+	@p='file-lock2'; \
+	b='file-lock2'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 misc.log: misc
 	@p='misc'; \
 	b='misc'; \
@@ -1410,6 +1422,7 @@ $(srcdir)/jp-compat: $(jp_compat_DEPENDENCIES)
 $(srcdir)/command-line-options: $(command_line_options_DEPENDENCIES)
 $(srcdir)/cobj-idx: $(cobj_idx_DEPENDENCIES)
 $(srcdir)/file-lock: $(indexed_lock_DEPENDENCIES)
+$(srcdir)/file-lock2: $(indexed_lock2_DEPENDENCIES)
 $(srcdir)/misc: $(misc_DEPENDENCIES)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/file-lock.at b/tests/file-lock.at
index 24985fce..d6a75ebc 100644
--- a/tests/file-lock.at
+++ b/tests/file-lock.at
@@ -2,12 +2,4 @@ AT_INIT([file-lock])
 
 m4_include([lock-file.at])
 m4_include([access-same-record.at])
-m4_include([access-different-record.at])
-m4_include([input-mode.at])
-m4_include([same-process.at])
-m4_include([open-start-write-rewrite.at])
-m4_include([release-lock.at])
-m4_include([open-input.at])
-m4_include([lock-mode-clause.at])
-m4_include([lock-mode-automatic.at])
-m4_include([old-file.at])
+m4_include([access-different-record.at])
\ No newline at end of file
diff --git a/tests/file-lock2.at b/tests/file-lock2.at
new file mode 100644
index 00000000..51faa076
--- /dev/null
+++ b/tests/file-lock2.at
@@ -0,0 +1,10 @@
+AT_INIT([file-lock2])
+
+m4_include([input-mode.at])
+m4_include([same-process.at])
+m4_include([open-start-write-rewrite.at])
+m4_include([release-lock.at])
+m4_include([open-input.at])
+m4_include([lock-mode-clause.at])
+m4_include([lock-mode-automatic.at])
+m4_include([old-file.at])
\ No newline at end of file
diff --git a/tests/file-lock.src/input-mode.at b/tests/file-lock2.src/input-mode.at
similarity index 100%
rename from tests/file-lock.src/input-mode.at
rename to tests/file-lock2.src/input-mode.at
diff --git a/tests/file-lock.src/lock-mode-automatic.at b/tests/file-lock2.src/lock-mode-automatic.at
similarity index 100%
rename from tests/file-lock.src/lock-mode-automatic.at
rename to tests/file-lock2.src/lock-mode-automatic.at
diff --git a/tests/file-lock.src/lock-mode-clause.at b/tests/file-lock2.src/lock-mode-clause.at
similarity index 100%
rename from tests/file-lock.src/lock-mode-clause.at
rename to tests/file-lock2.src/lock-mode-clause.at
diff --git a/tests/file-lock.src/old-file.at b/tests/file-lock2.src/old-file.at
similarity index 100%
rename from tests/file-lock.src/old-file.at
rename to tests/file-lock2.src/old-file.at
diff --git a/tests/file-lock.src/open-input.at b/tests/file-lock2.src/open-input.at
similarity index 100%
rename from tests/file-lock.src/open-input.at
rename to tests/file-lock2.src/open-input.at
diff --git a/tests/file-lock.src/open-start-write-rewrite.at b/tests/file-lock2.src/open-start-write-rewrite.at
similarity index 100%
rename from tests/file-lock.src/open-start-write-rewrite.at
rename to tests/file-lock2.src/open-start-write-rewrite.at
diff --git a/tests/file-lock.src/release-lock.at b/tests/file-lock2.src/release-lock.at
similarity index 100%
rename from tests/file-lock.src/release-lock.at
rename to tests/file-lock2.src/release-lock.at
diff --git a/tests/file-lock.src/same-process.at b/tests/file-lock2.src/same-process.at
similarity index 100%
rename from tests/file-lock.src/same-process.at
rename to tests/file-lock2.src/same-process.at