diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index 0873d6bc..d78470f2 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -6,8 +6,15 @@ DIR=`mktemp -d`
 
 EXTRA="${1-}"
 
+ARCH=`flatpak --default-arch`
+
 # Init dir
-flatpak build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
+cat > ${DIR}/metadata <<EOF
+[Application]
+name=org.test.Hello
+runtime=org.test.Platform/$ARCH/master
+sdk=org.test.Platform/$ARCH/master
+EOF
 
 mkdir -p ${DIR}/files/bin
 cat > ${DIR}/files/bin/hello.sh <<EOF
@@ -53,7 +60,11 @@ gzip -c > ${DIR}/files/share/app-info/xmls/org.test.Hello.xml.gz <<EOF
 EOF
 cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/
 
+echo AAAAAAAAAA
+ls -l ${DIR}
 flatpak build-finish --command=hello.sh ${DIR}
+echo BBBBBBBBB
+ls -l ${DIR}
 mkdir -p repos
-flatpak build-export ${GPGARGS-} repos/test ${DIR}
+strace flatpak build-export ${GPGARGS-} repos/test ${DIR}
 rm -rf ${DIR}
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
index 10781c37..b1182fe3 100755
--- a/tests/make-test-runtime.sh
+++ b/tests/make-test-runtime.sh
@@ -7,8 +7,14 @@ DIR=`mktemp -d`
 ID=$1
 shift
 
-flatpak build-init ${DIR} ${ID} ${ID} ${ID}
-sed -i s/Application/Runtime/ ${DIR}/metadata
+mkdir ${DIR}/files
+mkdir ${DIR}/usr
+cat > ${DIR}/metadata <<EOF
+[Runtime]
+name=${ID}
+EOF
+
+cat ${DIR}/metadata
 
 # Add bash and dependencies
 mkdir -p ${DIR}/usr/bin
diff --git a/tests/test-extensions.sh b/tests/test-extensions.sh
index 147c26fc..db0e9c7c 100755
--- a/tests/test-extensions.sh
+++ b/tests/test-extensions.sh
@@ -32,9 +32,12 @@ make_extension () {
 
     local DIR=`mktemp -d`
 
-    ${FLATPAK} build-init ${DIR} ${ID} ${ID} ${ID}
-    sed -i s/Application/Runtime/ ${DIR}/metadata
+    cat > ${DIR}/metadata <<EOF
+[Runtime]
+name=${ID}
+EOF
     mkdir -p ${DIR}/usr
+    mkdir -p ${DIR}/files
     touch ${DIR}/usr/exists
     touch ${DIR}/usr/extension-$ID:$VERSION