diff --git a/__device-tests__/gutenberg-editor-lists.test.js b/__device-tests__/gutenberg-editor-lists.test.js
index ad708491e1..5fd4b52e03 100644
--- a/__device-tests__/gutenberg-editor-lists.test.js
+++ b/__device-tests__/gutenberg-editor-lists.test.js
@@ -63,6 +63,19 @@ describe( 'Gutenberg Editor tests for List block', () => {
 		await editorPage.verifyHtmlContent( testData.listHtml );
 	} );
 
+	it( 'should update format to ordered list, using toolbar button', async () => {
+		const listBlockElement = await editorPage.getListBlockAtPosition( 1 );
+
+		// Click List block to force EditText focus
+		await listBlockElement.click();
+
+		// Send a click on the order list format button
+		await editorPage.clickOrderedListToolBarButton();
+
+		// switch to html and verify html
+		await editorPage.verifyHtmlContent( testData.listHtmlOrdered );
+	} );
+
 	afterAll( async () => {
 		if ( ! isLocalEnvironment() ) {
 			driver.sauceJobStatus( allPassed );
diff --git a/__device-tests__/helpers/test-data.js b/__device-tests__/helpers/test-data.js
index 817c94abdb..149a86fc00 100644
--- a/__device-tests__/helpers/test-data.js
+++ b/__device-tests__/helpers/test-data.js
@@ -11,6 +11,9 @@ exports.listItem2 = `Honey`;
 exports.listHtml = `<!-- wp:list -->
 <ul><li>Milk</li><li>Honey</li></ul>
 <!-- /wp:list -->`;
+exports.listHtmlOrdered = `<!-- wp:list {"ordered":true} -->
+<ol><li>Milk</li><li>Honey</li></ol>
+<!-- /wp:list -->`;
 exports.listEndedHtml = `<!-- wp:list -->
 <ul><li>Milk</li></ul>
 <!-- /wp:list -->
diff --git a/__device-tests__/pages/editor-page.js b/__device-tests__/pages/editor-page.js
index 3900468156..5d019495b5 100644
--- a/__device-tests__/pages/editor-page.js
+++ b/__device-tests__/pages/editor-page.js
@@ -21,6 +21,8 @@ export default class EditorPage {
 	headingBlockName = 'Heading';
 	imageBlockName = 'Image';
 	galleryBlockName = 'Gallery';
+	unorderedListButtonName = 'Convert to unordered list';
+	orderedListButtonName = 'Convert to ordered list';
 
 	constructor( driver: wd.PromiseChainWebdriver ) {
 		this.driver = driver;
@@ -163,6 +165,11 @@ export default class EditorPage {
 		await blockButton.click();
 	}
 
+	async clickToolBarButton( buttonName: string ) {
+		const toolBarButton = await this.driver.elementByAccessibilityId( buttonName );
+		await toolBarButton.click();
+	}
+
 	// =========================
 	// Inline toolbar functions
 	// =========================
@@ -338,6 +345,10 @@ export default class EditorPage {
 		return text.toString();
 	}
 
+	async clickOrderedListToolBarButton() {
+		await this.clickToolBarButton( this.orderedListButtonName );
+	}
+
 	// =========================
 	// Image Block functions
 	// =========================