diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix
index 3b8b449d7585..e39681865ab2 100644
--- a/pkgs/build-support/writers/test.nix
+++ b/pkgs/build-support/writers/test.nix
@@ -471,7 +471,7 @@ recurseIntoAttrs {
     toml = expectDataEqual {
       file = writeTOML "data.toml" { hello = "world"; };
       expected = ''
-        hello = 'world'
+        hello = "world"
       '';
     };
 
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 0e0c9368fab1..46a0dfcfcfe9 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -461,18 +461,16 @@ optionalAttrs allowAliases aliases
       generate =
         name: value:
         pkgs.callPackage (
-          { runCommand, go-toml }:
+          { runCommand, remarshal }:
           runCommand name
             {
-              nativeBuildInputs = [ go-toml ];
+              nativeBuildInputs = [ remarshal ];
               value = builtins.toJSON value;
               passAsFile = [ "value" ];
               preferLocalBuild = true;
             }
-            # -use-json-number: preserve JSON ints as TOML ints
-            # (Go's json.Decoder defaults to float64 for all numbers)
             ''
-              jsontoml -use-json-number < "$valuePath" > "$out"
+              json2toml "$valuePath" "$out"
             ''
         ) { };
 
diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index 49b9ac4c8a30..f1da9041ea79 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -695,16 +695,14 @@ runBuildTests {
       float = 3.141
       int = 10
       list = [1, 2]
-      str = 'foo'
+      str = "foo"
       true = true
 
       [attrs]
-      foo = 'foo'
+      foo = "foo"
 
-      [level1]
-      [level1.level2]
       [level1.level2.level3]
-      level4 = 'deep'
+      level4 = "deep"
     '';
   };
 
@@ -725,7 +723,7 @@ runBuildTests {
       ];
     };
     expected = ''
-      language-server = ['bash-language-server', {except-features = ['diagnostics'], name = 'typescript-language-server'}]
+      language-server = ["bash-language-server", {except-features = ["diagnostics"], name = "typescript-language-server"}]
     '';
   };
 
@@ -739,7 +737,7 @@ runBuildTests {
       "stack(x,n)" = "foobar";
     };
     expected = ''
-      'stack(x,n)' = 'foobar'
+      "stack(x,n)" = "foobar"
     '';
   };