diff --git a/CHANGES.md b/CHANGES.md
index 3f8145c..8b867d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,7 @@
 NEXT RELEASE
 ------------
 
+- Reenable `with-test` from `mutaml.opam` on ppc64 and riscv64 platforms #54
 - Use `MUTAML_DIFF_COMMAND="gdiff -u"` in cram tests on FreeBSD for consistent output #53
 
 0.4
diff --git a/mutaml.opam b/mutaml.opam
index 5313ed0..16dcf4f 100644
--- a/mutaml.opam
+++ b/mutaml.opam
@@ -32,8 +32,6 @@ depends: [
   "ounit2" {with-test}
   "odoc" {with-doc}
 ]
-dev-repo: "git+https://github.com/jmid/mutaml.git"
-x-maintenance-intent: ["(latest)"]
 build: [
   ["dune" "subst"] {dev}
   [
@@ -44,7 +42,9 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test & arch != "ppc64" & arch != "riscv64"}
+    "@runtest" {with-test}
     "@doc" {with-doc}
   ]
 ]
+dev-repo: "git+https://github.com/jmid/mutaml.git"
+x-maintenance-intent: ["(latest)"]
diff --git a/mutaml.opam.template b/mutaml.opam.template
deleted file mode 100644
index 892c85d..0000000
--- a/mutaml.opam.template
+++ /dev/null
@@ -1,14 +0,0 @@
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@runtest" {with-test & arch != "ppc64" & arch != "riscv64"}
-    "@doc" {with-doc}
-  ]
-]