diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 3fc19c8ff1b484fe273c9187a85223d0a1a7aa14..84ddc09d97c7860bc8945b7b73eb7757598c7f2f 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -2109,27 +2109,6 @@ proc test_select_type_params { type } {
 	return $ret
 }
 
-################################################################
-#
-# Proc: test_aix
-#
-# Purpose: Determine if the system is AIX
-#
-# Returns 1 if the system is AIX, 0 otherwise
-#
-################################################################
-
-proc test_aix {} {
-	set fd [open "|uname"]
-	gets $fd line
-	close $fd
-	if {[string compare $line AIX] == 0} {
-		return 1
-	} else {
-		return 0
-	}
-}
-
 ################################################################
 #
 # Proc: test_super_user
diff --git a/testsuite/expect/test1.29 b/testsuite/expect/test1.29
index b5eb6e5ce396ea05e0b996022ff1163367d8e46c..b946a09f16069f57ef3ad03fe5552afc1a1ffb93 100755
--- a/testsuite/expect/test1.29
+++ b/testsuite/expect/test1.29
@@ -6,9 +6,6 @@
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
-#
-# Note:    AIX does not support the NPROC limit, but this test should
-#          otherwise succeed
 ############################################################################
 # Copyright (C) 2002 The Regents of the University of California.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
diff --git a/testsuite/expect/test1.36 b/testsuite/expect/test1.36
index 115e84ccc20b12194feb39c46f7af372fcfdfa2a..145b869c84c8a031a87b0e0c91cca46fabb4843c 100755
--- a/testsuite/expect/test1.36
+++ b/testsuite/expect/test1.36
@@ -50,10 +50,7 @@ if {[test_alps]} {
 #
 set mult         4
 set task_output  0
-if {[test_aix]} {
-	set task_cnt 3
-	set node_cnt 1-4
-} elseif {[test_serial]} {
+if {[test_serial]} {
 	set task_cnt 1
 	set node_cnt 1-1
 } else {
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 0279d3bd888b1e755feb162a4289e49bbc4413a8..7358a13ee294dd1ce2a92dc5d79a179f86729bfa 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -57,9 +57,6 @@ if {[file executable $mpicc] == 0} {
 if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit 0
-} elseif {[test_aix]} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
 } elseif {[test_serial]} {
 	send_user "WARNING: Test is incompatible with serial system\n"
 	exit 0
diff --git a/testsuite/expect/test1.95 b/testsuite/expect/test1.95
index 291439210b5e53299491f5451687537fd0275ac1..01ba228c9b5c364e067f557e35feb509abcac856 100755
--- a/testsuite/expect/test1.95
+++ b/testsuite/expect/test1.95
@@ -56,9 +56,6 @@ if {[file executable $upcc] == 0} {
 if {[test_front_end]} {
 	send_user "\nWARNING: This test is incompatible with front-end systems\n"
 	exit 0
-} elseif {[test_aix]} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
 } elseif {[test_serial]} {
 	send_user "WARNING: Test is incompatible with serial system\n"
 	exit 0
diff --git a/testsuite/expect/test1.96 b/testsuite/expect/test1.96
index 8a11cc5dd1760b4db3b41369a61367953bd0c7c8..982dc2a7a561d1d2fd764e5b5c422cd9aadfd216 100755
--- a/testsuite/expect/test1.96
+++ b/testsuite/expect/test1.96
@@ -45,9 +45,6 @@ print_header $test_id
 if {[test_front_end]} {
 	send_user "\nWARNING: This test is incompatible with front-end systems\n"
 	exit 0
-} elseif {[test_aix]} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
 } elseif {[test_serial]} {
 	send_user "WARNING: Test is incompatible with serial system\n"
 	exit 0
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 7696c2b7d29e1b79121920c96b5bc2db1f2842a8..905ee0bc4ea2edbb429b01497f3b56305c2251b2 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -168,13 +168,6 @@ if {$matches != 1} {
 	set exit_code 1
 }
 
-# Actual checkpoint on AIX only works for tasks launched using POE
-if {[test_aix] == 1} {
-	send_user "WARNING: Further testing is incompatible with AIX\n"
-	cancel_job $job_id
-	exit $exit_code
-}
-
 #
 # Create a checkpoint, continue execution
 #
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index 4a28bf58f8f3175c7d8884f9b3b0483f436f4c57..5a1cfcfff36dae13889c56195f3d00efd09a9f9f 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -41,7 +41,6 @@ set file_prog   "test$test_id.prog"
 set file_name   "/tmp/test$test_id.filename"
 set job_id      0
 set matches     0
-set aix         0
 
 # job parameters
 set mem_size    1048576
@@ -242,16 +241,6 @@ expect {
 		set supported_gather 1
 		exp_continue
 	}
-	-re "JobAcctGatherType *= jobacct_gather/aix" {
-		set supported_gather 1
-		set aix 1
-		send_user "AIX doesn't do a great job tracking memory usage,\n"
-		send_user "as long as some memory number was\n"
-		send_user "returned we are ok since users are looking for\n"
-		send_user "mostly abnormalities between tasks instead\n"
-		send_user "of actual memory usuage.\n"
-		exp_continue
-	}
 	eof {
 		wait
 	}
@@ -433,15 +422,6 @@ if {[_get_file_size $sacct] != 0} {
 	set exit_code 1
 }
 
-if {$aix == 1 && $exit_code == 1} {
-	send_user "\nIf there were failures in the memory parts of this\n"
-	send_user "test, they are expected.  AIX doesn't do a great job\n"
-	send_user "tracking memory usage, as long as some memory number was\n"
-	send_user "returned we are ok since users are looking for\n"
-	send_user "mostly abnormalities between tasks instead of actual\n"
-	send_user "memory usuage.\n"
-}
-
 if {$exit_code == 0} {
 	exec rm -f $file_prog $file_in $file_out $file_err $file_name
 	send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test17.15 b/testsuite/expect/test17.15
index 97ae71f94a3d28ae4e5d65ab9ce72b5c319ebe23..8b8dff2a11c734428d90c9786823a568ff8e1794 100755
--- a/testsuite/expect/test17.15
+++ b/testsuite/expect/test17.15
@@ -6,9 +6,6 @@
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
-#
-# Note:    AIX does not support the NPROC limit, but this test should
-#          otherwise succeed
 ############################################################################
 # Copyright (C) 2002-2006 The Regents of the University of California.
 # Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1
index 718c2e18440b5dbabdb948c190af637b80a49ff5..b5ea3a0c034a86a979ed6ae8ec7dca7aa3d59341 100755
--- a/testsuite/expect/test24.1
+++ b/testsuite/expect/test24.1
@@ -54,14 +54,9 @@ if {$damp != 1} {
 file delete $test_prog
 
 send_user "build_dir is $build_dir\n"
-if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -ldl -lm -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o\n"
-	exec       $bin_cc ${test_prog}.c -ldl -lm -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o
-} else {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o -ldl -lm  -export-dynamic \n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -lm  -export-dynamic
-}
-	exec $bin_chmod 700 $test_prog
+send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o -ldl -lm  -export-dynamic \n"
+exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -lm  -export-dynamic
+exec $bin_chmod 700 $test_prog
 
 # Usage: test24.1.prog
 spawn ./$test_prog
diff --git a/testsuite/expect/test24.3 b/testsuite/expect/test24.3
index df3c5f30df4b43a6fe0b88639e7c494e0732605c..c2885e045b34fe78a6f978ff079b3a18c47efd19 100755
--- a/testsuite/expect/test24.3
+++ b/testsuite/expect/test24.3
@@ -58,14 +58,9 @@ if {$damp != 1} {
 file delete $test_prog
 
 send_user "build_dir is $build_dir\n"
-if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -ldl -lm -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-bhwloc -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o\n"
-	exec       $bin_cc ${test_prog}.c -ldl -lm -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-bhwloc -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o
-} else {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic \n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic
-}
-	exec $bin_chmod 700 $test_prog
+send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic \n"
+exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic
+exec $bin_chmod 700 $test_prog
 
 # Usage: test24.3.prog
 spawn ./$test_prog
diff --git a/testsuite/expect/test24.4 b/testsuite/expect/test24.4
index 4ef8d120a28feaae8dcafbf5d23179d66d2a5890..78dcfecaca2f4f0d5455848092a58d76d8fe1f77 100755
--- a/testsuite/expect/test24.4
+++ b/testsuite/expect/test24.4
@@ -57,14 +57,9 @@ if {$damp != 1} {
 file delete $test_prog
 
 send_user "build_dir is $build_dir\n"
-if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -ldl -lm -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-bhwloc -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o\n"
-	exec       $bin_cc ${test_prog}.c -ldl -lm -lntbl -fno-gcse -fno-strict-aliasing -Wl,-brtl -Wl,-bgcbypass:1000 -Wl,-bexpfull -Wl,-bmaxdata:0x70000000 -Wl,-bhwloc -g -lpthreads -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o
-} else {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic \n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic
-}
-	exec $bin_chmod 700 $test_prog
+send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o  ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic \n"
+exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${build_dir} -I${src_dir} ${build_dir}/src/api/libslurm.o ${build_dir}/src/slurmctld/locks.o ${build_dir}/src/sshare/process.o -ldl -lm -lhwloc -export-dynamic
+exec $bin_chmod 700 $test_prog
 
 # Usage: test24.4.prog
 spawn ./$test_prog
diff --git a/testsuite/expect/test33.1 b/testsuite/expect/test33.1
index 11e61b751bad18a26b13ddf3e020eb7d017589ea..74e4d2cfe706da312b160191eacc9120700e8eb1 100755
--- a/testsuite/expect/test33.1
+++ b/testsuite/expect/test33.1
@@ -87,10 +87,7 @@ proc run_config { test_config } {
 #
 file delete $test_prog
 
-if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl\n"
-	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl
-} elseif [file exists ${slurm_dir}/lib64/libslurm.so] {
+if [file exists ${slurm_dir}/lib64/libslurm.so] {
 	send_user "$bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl\n"
 	exec       $bin_cc ${test_prog}.c -g -pthread -export-dynamic -o ${test_prog} -I${src_dir} -I${build_dir} ${build_dir}/src/api/libslurm.o  -ldl
 } else {
diff --git a/testsuite/expect/test38.6 b/testsuite/expect/test38.6
index ef2396f962b329119928d84408f26442bf5493b4..e20c68b779af96d575be2b97cc0c2803146c2221 100755
--- a/testsuite/expect/test38.6
+++ b/testsuite/expect/test38.6
@@ -44,10 +44,6 @@ if {[test_super_user] == 0} {
 	send_user "\nWARNING: This test must be run as SlurmUser\n"
 	exit 0
 }
-if {[test_aix]} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
-}
 if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
diff --git a/testsuite/expect/test38.7 b/testsuite/expect/test38.7
index 3069410eca37ba5aa31bce8d094e86472d57d886..8f4f82d923c3ee7696c12a0ce8d0b7d21dac232e 100755
--- a/testsuite/expect/test38.7
+++ b/testsuite/expect/test38.7
@@ -57,9 +57,6 @@ if {[file executable $mpicc] == 0} {
 if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit 0
-} elseif {[test_aix]} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
 } elseif {[test_serial]} {
 	send_user "WARNING: Test is incompatible with serial system\n"
 	exit 0
diff --git a/testsuite/expect/test7.10 b/testsuite/expect/test7.10
index 8982316dc0fd1c6ba272a48d0dd2783f3ffcd111..94f24efd10bf34e98f1dd8e953a8a6d58854b54b 100755
--- a/testsuite/expect/test7.10
+++ b/testsuite/expect/test7.10
@@ -43,10 +43,6 @@ if {[test_super_user] == 1} {
 	send_user "\nWARNING: This test can't be run as SlurmUser\n"
 	exit 0
 }
-if {[test_aix] == 1} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
-}
 
 #
 # Build a shared object that emulates getuid/getgid functions
diff --git a/testsuite/expect/test7.11 b/testsuite/expect/test7.11
index 155ff2b057eced46ef472a498473789a31348552..0783e6a48ce794213172d668784f0327927dbcbc 100755
--- a/testsuite/expect/test7.11
+++ b/testsuite/expect/test7.11
@@ -48,10 +48,6 @@ if {[test_super_user] == 0} {
 	send_user "\nWARNING: This test must be run as SlurmUser\n"
 	exit 0
 }
-if {[test_aix]} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
-}
 if {[test_front_end]} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit $exit_code
diff --git a/testsuite/expect/test7.12 b/testsuite/expect/test7.12
index f83831ca7b863b06998745c9ae7f27d576bf3f83..1833836cb7e088924da7a4957bd174ac9614594b 100755
--- a/testsuite/expect/test7.12
+++ b/testsuite/expect/test7.12
@@ -65,10 +65,7 @@ make_bash_script $file_in "
 "
 
 send_user "slurm_dir is $slurm_dir\n"
-if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -Wl,-brtl -g -pthread -o ${test_prog} -I${slurm_dir}/include  -L${slurm_dir}/lib -lslurm -lntbl\n"
-	exec       $bin_cc ${test_prog}.c -Wl,-brtl -g -pthread -o ${test_prog} -I${slurm_dir}/include  -L${slurm_dir}/lib -lslurm -lntbl
-} elseif [file exists ${slurm_dir}/lib64/libslurm.so] {
+if [file exists ${slurm_dir}/lib64/libslurm.so] {
 	send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,-rpath=${slurm_dir}/lib64 -L${slurm_dir}/lib64 -lslurm\n"
 	exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,-rpath=${slurm_dir}/lib64 -L${slurm_dir}/lib64 -lslurm
 } else {
diff --git a/testsuite/expect/test7.2 b/testsuite/expect/test7.2
index 16bf58b9a03889efeb687bba1e311352ae35fbe5..b8cf616cb0f1cd6bcf5788d010931d812e400b57 100755
--- a/testsuite/expect/test7.2
+++ b/testsuite/expect/test7.2
@@ -49,11 +49,7 @@ if {[test_cray]} {
 # Delete left-over program and rebuild it.
 #
 exec $bin_rm -f $file_prog_get
-if {![test_aix]} {
-	exec $bin_cc ${file_prog_get}.c -g -pthread -o $file_prog_get -I${slurm_dir}/include -L${slurm_dir}/lib64 -Wl,-rpath=${slurm_dir}/lib64 -L${slurm_dir}/lib -Wl,-rpath=${slurm_dir}/lib -lpmi
-} else {
-	exec $bin_cc ${file_prog_get}.c -Wl,-brtl -g -pthread -o $file_prog_get -I${slurm_dir}/include -L${slurm_dir}/lib -lpmi
-}
+exec $bin_cc ${file_prog_get}.c -g -pthread -o $file_prog_get -I${slurm_dir}/include -L${slurm_dir}/lib64 -Wl,-rpath=${slurm_dir}/lib64 -L${slurm_dir}/lib -Wl,-rpath=${slurm_dir}/lib -lpmi
 exec $bin_chmod 700 $file_prog_get
 
 #
diff --git a/testsuite/expect/test7.3 b/testsuite/expect/test7.3
index fed9379c0e0f2b8e1156935f1fc17ddd8e93f2b8..a8c060f75e70807228e32aaae648188be9e11109 100755
--- a/testsuite/expect/test7.3
+++ b/testsuite/expect/test7.3
@@ -55,10 +55,7 @@ exec $bin_cc -O -o $io_prog ${io_prog}.c
 exec $bin_chmod 700 $io_prog
 
 send_user "slurm_dir is $slurm_dir\n"
-if {[test_aix]} {
-	send_user "$bin_cc ${test_prog}.c -Wl,-brtl -g -pthread -o ${test_prog} -I${slurm_dir}/include  -L${slurm_dir}/lib -lslurm -lntbl\n"
-	exec       $bin_cc ${test_prog}.c -Wl,-brtl -g -pthread -o ${test_prog} -I${slurm_dir}/include  -L${slurm_dir}/lib -lslurm -lntbl
-} elseif [file exists ${slurm_dir}/lib64/libslurm.so] {
+if [file exists ${slurm_dir}/lib64/libslurm.so] {
 	send_user "$bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,-rpath=${slurm_dir}/lib64 -L${slurm_dir}/lib64 -lslurm\n"
 	exec       $bin_cc ${test_prog}.c -g -pthread -o ${test_prog} -I${slurm_dir}/include -Wl,-rpath=${slurm_dir}/lib64 -L${slurm_dir}/lib64 -lslurm
 } else {
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index 934a0f14dc8ad7ed77370f50dc2f0ff8f77538df..d9404de4b1c124095db8cb1ecf98239814b811f3 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -79,10 +79,6 @@ if {[test_front_end] != 0} {
         send_user "\nWARNING: This test is incompatible with front-end systems\n"
         exit 0
 }
-if {[test_aix] == 1} {
-	send_user "WARNING: Test is incompatible with AIX\n"
-	exit 0
-}
 
 #
 # Put desired Slurm install directory at head of search path for bulk launch
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index 6e98c53cab2372c4a0bfc8734ca142bb6cab78b2..ffbbf4e1ab8be3c845b598f5f55486cfbbad0b84 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -49,8 +49,7 @@ if {![test_accting_steps]} {
 }
 
 #
-# Test is incompatible with proctrack/aix, proctrack/rms, proctrack/sgi_job,
-# and proctrack/cray
+# Test is incompatible with certain plugins.
 #
 # Each leave open files, although we could clear the proctrack related files
 # by just closing all files after fd=3.
@@ -64,16 +63,6 @@ expect {
 		set invalid 1
 		exp_continue
 	}
-	-re "proctrack/aix" {
-		send_user "\nWARNING: test incompatible with proctrack/aix\n"
-		set invalid 1
-		exp_continue
-	}
-	-re "proctrack/rms" {
-		send_user "\nWARNING: test incompatible with proctrack/rms\n"
-		set invalid 1
-		exp_continue
-	}
 	-re "proctrack/sgi_job" {
 		send_user "\nWARNING: test incompatible with proctrack/sgi_job\n"
 		set invalid 1
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index eadefd17eaa55c2a40e7e2b1264ba8acb9a3b017..fc6b5b4262d92a7c37f1a6d198ed241dc87fdbfc 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -183,9 +183,6 @@ while { 1 } {
 	}
 	exec $bin_sleep 3
 }
-if {[test_aix]} {
-	sleep 5
-}
 
 log_user 1
 if {$step_count < $desired_tasks} {