diff --git a/.github/actions/run-build/action.yml b/.github/actions/run-build/action.yml
index 9afcfb11e72..58c9dd6de31 100644
--- a/.github/actions/run-build/action.yml
+++ b/.github/actions/run-build/action.yml
@@ -36,7 +36,6 @@ runs:
           -e CMAKE_GENERATOR \
           -e CMAKE_OPTIONS \
           -e GITTEST_NEGOTIATE_PASSWORD \
-          -e GITTEST_FLAKY_STAT \
           -e PKG_CONFIG_PATH \
           -e SKIP_NEGOTIATE_TESTS \
           -e SKIP_SSH_TESTS \
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 852a3fb8339..62aeec2c06b 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -282,7 +282,6 @@ jobs:
             RUN_INVASIVE_TESTS: true
             SKIP_PROXY_TESTS: true
             SKIP_PUSHOPTIONS_TESTS: true
-            GITTEST_FLAKY_STAT: true
           os: ubuntu-latest
         - name: "Linux (arm64, Bionic, GCC, OpenSSL)"
           id: bionic-arm64-gcc-openssl
diff --git a/tests/libgit2/CMakeLists.txt b/tests/libgit2/CMakeLists.txt
index 7a4bb476ca5..c5fe4d9b508 100644
--- a/tests/libgit2/CMakeLists.txt
+++ b/tests/libgit2/CMakeLists.txt
@@ -19,7 +19,6 @@ add_definitions(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\")
 add_definitions(-DCLAR_TMPDIR=\"libgit2_tests\")
 add_definitions(-DCLAR_WIN32_LONGPATHS)
 add_definitions(-DCLAR_HAS_REALPATH)
-add_definitions(-D_FILE_OFFSET_BITS=64)
 
 # Ensure that we do not use deprecated functions internally
 add_definitions(-DGIT_DEPRECATE_HARD)
diff --git a/tests/libgit2/diff/workdir.c b/tests/libgit2/diff/workdir.c
index 602460908bb..36eb9a9d30d 100644
--- a/tests/libgit2/diff/workdir.c
+++ b/tests/libgit2/diff/workdir.c
@@ -1291,8 +1291,7 @@ void test_diff_workdir__can_diff_empty_file(void)
 
 	cl_git_pass(git_fs_path_lstat("attr_index/README.txt", &st));
 
-	if (!cl_is_env_set("GITTEST_FLAKY_STAT"))
-		cl_assert_equal_sz(0, st.st_size);
+	cl_assert_equal_sz(0, st.st_size);
 
 	cl_git_pass(git_diff_tree_to_workdir(&diff, g_repo, tree, &opts));
 	cl_assert_equal_i(3, (int)git_diff_num_deltas(diff));
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 425c27dcdc5..183d0baf6b2 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -19,7 +19,6 @@ add_definitions(-DCLAR_FIXTURE_PATH=\"${CLAR_FIXTURES}\")
 add_definitions(-DCLAR_TMPDIR=\"libgit2_tests\")
 add_definitions(-DCLAR_WIN32_LONGPATHS)
 add_definitions(-DCLAR_HAS_REALPATH)
-add_definitions(-D_FILE_OFFSET_BITS=64)
 
 # Ensure that we do not use deprecated functions internally
 add_definitions(-DGIT_DEPRECATE_HARD)
diff --git a/tests/util/copy.c b/tests/util/copy.c
index 2613730ba25..7ea5d6a39fc 100644
--- a/tests/util/copy.c
+++ b/tests/util/copy.c
@@ -14,8 +14,7 @@ void test_copy__file(void)
 	cl_git_pass(git_fs_path_lstat("copy_me_two", &st));
 	cl_assert(S_ISREG(st.st_mode));
 
-	if (!cl_is_env_set("GITTEST_FLAKY_STAT"))
-		cl_assert_equal_sz(strlen(content), (size_t)st.st_size);
+	cl_assert_equal_sz(strlen(content), (size_t)st.st_size);
 
 	cl_git_pass(p_unlink("copy_me_two"));
 	cl_git_pass(p_unlink("copy_me"));
@@ -41,8 +40,7 @@ void test_copy__file_in_dir(void)
 	cl_git_pass(git_fs_path_lstat("an_dir/second_dir/and_more/copy_me_two", &st));
 	cl_assert(S_ISREG(st.st_mode));
 
-	if (!cl_is_env_set("GITTEST_FLAKY_STAT"))
-		cl_assert_equal_sz(strlen(content), (size_t)st.st_size);
+	cl_assert_equal_sz(strlen(content), (size_t)st.st_size);
 
 	cl_git_pass(git_futils_rmdir_r("an_dir", NULL, GIT_RMDIR_REMOVE_FILES));
 	cl_assert(!git_fs_path_isdir("an_dir"));
@@ -105,8 +103,7 @@ void test_copy__tree(void)
 	cl_git_pass(git_fs_path_lstat("t1/c/f3", &st));
 	cl_assert(S_ISREG(st.st_mode));
 
-	if (!cl_is_env_set("GITTEST_FLAKY_STAT"))
-		cl_assert_equal_sz(strlen(content), (size_t)st.st_size);
+	cl_assert_equal_sz(strlen(content), (size_t)st.st_size);
 
 #ifndef GIT_WIN32
 	memset(&st, 0, sizeof(struct stat));