diff --git a/tests/python/include/folly/tracing/StaticTracepoint-ELFx86.h b/tests/python/include/folly/tracing/StaticTracepoint-ELF.h
similarity index 97%
rename from tests/python/include/folly/tracing/StaticTracepoint-ELFx86.h
rename to tests/python/include/folly/tracing/StaticTracepoint-ELF.h
index 033809cb3cb7..4782830975de 100644
--- a/tests/python/include/folly/tracing/StaticTracepoint-ELFx86.h
+++ b/tests/python/include/folly/tracing/StaticTracepoint-ELF.h
@@ -25,7 +25,13 @@
 #endif
 
 // Instruction to emit for the probe.
+#if defined(__x86_64__) || defined(__i386__)
 #define FOLLY_SDT_NOP                 nop
+#elif defined(__aarch64__) || defined(__arm__)
+#define FOLLY_SDT_NOP                 nop
+#else
+#error "Unsupported architecture"
+#endif
 
 // Note section properties.
 #define FOLLY_SDT_NOTE_NAME           "stapsdt"
diff --git a/tests/python/include/folly/tracing/StaticTracepoint.h b/tests/python/include/folly/tracing/StaticTracepoint.h
index 858b7dbc0cee..86f8e40cd1d2 100644
--- a/tests/python/include/folly/tracing/StaticTracepoint.h
+++ b/tests/python/include/folly/tracing/StaticTracepoint.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) && \
+#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__) || defined(__aarch64__) || defined(__arm__)) && \
     !FOLLY_DISABLE_SDT
 
-#include <folly/tracing/StaticTracepoint-ELFx86.h>
+#include <folly/tracing/StaticTracepoint-ELF.h>
 
 #define FOLLY_SDT(provider, name, ...) \
   FOLLY_SDT_PROBE_N(                   \