6 files changed, 29 insertions, 26 deletions
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json
index af57447d30..bcd6f686b8 100644
--- a/keyboards/handwired/pytest/basic/info.json
+++ b/keyboards/handwired/pytest/basic/info.json
@@ -2,7 +2,7 @@
     "layouts": {
         "LAYOUT_custom": {
             "layout": [
-                { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }
+                {"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json b/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json
new file mode 100644
index 0000000000..a64a65a80a
--- /dev/null
+++ b/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json
@@ -0,0 +1,12 @@
+{
+    "keyboard": "handwired/pytest/basic",
+    "keymap": "default_json",
+    "layout": "LAYOUT_ortho_1x1",
+    "layers": [["EXAMPLE_1"]],
+    "keycodes": [
+        { "key": "EXAMPLE_1" }
+    ],
+    "author": "qmk",
+    "notes": "This file is a keymap.json file for handwired/pytest/basic",
+    "version": 1
+}
diff --git a/keyboards/handwired/pytest/config.h b/keyboards/handwired/pytest/config.h
deleted file mode 100644
index a61b8f5094..0000000000
--- a/keyboards/handwired/pytest/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index 11442461d4..00a3bff1f6 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -7,12 +7,20 @@
         "pid": "0x6465",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4"],
+        "rows": ["F5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_1x1"
+    },
     "layouts": {
         "LAYOUT_ortho_1x1": {
             "layout": [
-                { "w": 1, "x": 0, "y": 0 }
+                {"matrix": [0, 0], "x": 0, "y": 0}
             ]
         }
     }
diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/info.json
index ed052a14a3..6c2d0dea4d 100644
--- a/keyboards/handwired/pytest/macro/info.json
+++ b/keyboards/handwired/pytest/macro/info.json
@@ -1,10 +1,10 @@
 {
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT_custom": {
-      "layout": [
-        { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }
-      ]
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_custom": {
+            "layout": [
+                {"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/handwired/pytest/pytest.h b/keyboards/handwired/pytest/pytest.h
deleted file mode 100644
index b8fe7dde59..0000000000
--- a/keyboards/handwired/pytest/pytest.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_1x1( \
-    k00 \
-) { \
-    { k00 } \
-}
-
-#define LAYOUT LAYOUT_ortho_1x1