diff --git a/includes/class-wc-countries.php b/includes/class-wc-countries.php
index 1abcf8258ed..7cc873b639a 100644
--- a/includes/class-wc-countries.php
+++ b/includes/class-wc-countries.php
@@ -992,11 +992,21 @@ class WC_Countries {
 						),
 					),
 					'JP' => array(
+						'last_name' => array(
+							'class'    => array( 'form-row-first' ),
+							'priority' => 10,
+						),
+						'first_name'=> array(
+							'class'    => array( 'form-row-last' ),
+							'priority' => 20,
+						),
 						'postcode'  => array(
+							'class'    => array( 'form-row-first' ),
 							'priority' => 65,
 						),
 						'state'     => array(
 							'label'    => __( 'Prefecture', 'woocommerce' ),
+							'class'    => array( 'form-row-last' ),
 							'priority' => 66,
 						),
 						'city'      => array(