diff --git a/fmpz_extras/lshift_mpn.c b/fmpz_extras/lshift_mpn.c
index b5d40ae6..2571fa2a 100644
--- a/fmpz_extras/lshift_mpn.c
+++ b/fmpz_extras/lshift_mpn.c
@@ -56,7 +56,7 @@ fmpz_lshift_mpn(fmpz_t z, mp_srcptr d, mp_size_t dn, int sgnbit, mp_bitcnt_t shi
             zn--;
     }
 
-    zmpz->_mp_size = sgnbit ? -(long) zn : zn;
+    zmpz->_mp_size = sgnbit ? -(slong) zn : zn;
     _fmpz_demote_val(z);
 }
 
diff --git a/fmpz_extras/test/t-add2_fmpz_si_inline.c b/fmpz_extras/test/t-add2_fmpz_si_inline.c
index aab2c752..b4af7bdd 100644
--- a/fmpz_extras/test/t-add2_fmpz_si_inline.c
+++ b/fmpz_extras/test/t-add2_fmpz_si_inline.c
@@ -27,7 +27,7 @@
 
 int main()
 {
-    long iter;
+    slong iter;
     flint_rand_t state;
 
     printf("add2_fmpz_si_inline....");
@@ -38,7 +38,7 @@ int main()
     for (iter = 0; iter < 100000; iter++)
     {
         fmpz_t a, b, c, d;
-        long e;
+        slong e;
 
         fmpz_init(a);
         fmpz_init(b);
diff --git a/fmpz_extras/test/t-add_inline.c b/fmpz_extras/test/t-add_inline.c
index accbc04b..02a1ad3c 100644
--- a/fmpz_extras/test/t-add_inline.c
+++ b/fmpz_extras/test/t-add_inline.c
@@ -27,7 +27,7 @@
 
 int main()
 {
-    long iter;
+    slong iter;
     flint_rand_t state;
 
     printf("add_inline....");
diff --git a/fmpz_extras/test/t-add_si_inline.c b/fmpz_extras/test/t-add_si_inline.c
index b8fc538f..8f56233c 100644
--- a/fmpz_extras/test/t-add_si_inline.c
+++ b/fmpz_extras/test/t-add_si_inline.c
@@ -27,7 +27,7 @@
 
 int main()
 {
-    long iter;
+    slong iter;
     flint_rand_t state;
 
     printf("add_si_inline....");
@@ -38,7 +38,7 @@ int main()
     for (iter = 0; iter < 100000; iter++)
     {
         fmpz_t a, c, d;
-        long b;
+        slong b;
 
         fmpz_init(a);
         fmpz_init(c);
diff --git a/fmpz_extras/test/t-add_ui_inline.c b/fmpz_extras/test/t-add_ui_inline.c
index aca0d693..532a9181 100644
--- a/fmpz_extras/test/t-add_ui_inline.c
+++ b/fmpz_extras/test/t-add_ui_inline.c
@@ -27,7 +27,7 @@
 
 int main()
 {
-    long iter;
+    slong iter;
     flint_rand_t state;
 
     printf("add_ui_inline....");
diff --git a/fmpz_extras/test/t-lshift_mpn.c b/fmpz_extras/test/t-lshift_mpn.c
index c68ab938..a968e519 100644
--- a/fmpz_extras/test/t-lshift_mpn.c
+++ b/fmpz_extras/test/t-lshift_mpn.c
@@ -27,7 +27,7 @@
 
 int main()
 {
-    long iter;
+    slong iter;
     flint_rand_t state;
 
     printf("lshift_mpn....");
diff --git a/fmpz_extras/test/t-sub_si_inline.c b/fmpz_extras/test/t-sub_si_inline.c
index 3e11c280..b61bed5e 100644
--- a/fmpz_extras/test/t-sub_si_inline.c
+++ b/fmpz_extras/test/t-sub_si_inline.c
@@ -27,7 +27,7 @@
 
 int main()
 {
-    long iter;
+    slong iter;
     flint_rand_t state;
 
     printf("sub_si_inline....");
@@ -38,7 +38,7 @@ int main()
     for (iter = 0; iter < 100000; iter++)
     {
         fmpz_t a, c, d;
-        long b;
+        slong b;
 
         fmpz_init(a);
         fmpz_init(c);